From 3e779f552bec4fad5dc0dbdd893f555e0cf3735e Mon Sep 17 00:00:00 2001 From: pveeckhout Date: Thu, 23 Nov 2023 23:35:12 +0100 Subject: [PATCH 1/5] #134 (https://github.com/ed-pilots-network/backend/issues/134) adding JournalDocked Message --- build.gradle | 2 +- .../dto/eddn/journal/DockedMessage.java | 73 +++++++++++++++++ .../JournalDockedMessageTest.java | 29 +++++++ .../JournalScanMessageTest.java | 6 +- .../journal/1_dir/docked/1.json | 70 ++++++++++++++++ .../journal/1_dir/docked/2.json | 78 ++++++++++++++++++ .../journal/1_dir/docked/3.json | 66 +++++++++++++++ .../journal/1_dir/docked/4.json | 63 +++++++++++++++ .../journal/1_dir/docked/5.json | 76 ++++++++++++++++++ .../journal/1_dir/docked/6.json | 80 +++++++++++++++++++ .../journal/1_dir/docked/7.json | 76 ++++++++++++++++++ .../journal/{ => 1_dir}/scan/1.json | 0 .../journal/{ => 1_dir}/scan/2.json | 0 .../journal/{ => 1_dir}/scan/3.json | 0 .../journal/{ => 1_dir}/scan/4.json | 0 .../journal/{ => 1_dir}/scan/5.json | 0 .../journal/{ => 1_dir}/scan/6.json | 0 17 files changed, 615 insertions(+), 4 deletions(-) create mode 100644 src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java create mode 100644 src/test/java/io/edpn/backend/messageprocessorlib/JournalDockedMessageTest.java create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/1.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/2.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/3.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/4.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/5.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/6.json create mode 100644 src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/7.json rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/1.json (100%) rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/2.json (100%) rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/3.json (100%) rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/4.json (100%) rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/5.json (100%) rename src/test/resources/data/eddn-observed-messages/journal/{ => 1_dir}/scan/6.json (100%) diff --git a/build.gradle b/build.gradle index e08577d..092d9fc 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } ext { - backendUtilVersion = '0.0.3-SNAPSHOT' + backendUtilVersion = '0.0.4-SNAPSHOT' jacksonVersion = '2.14.2' junitJupiterVersion = "5.9.3" } diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java new file mode 100644 index 0000000..5edef28 --- /dev/null +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java @@ -0,0 +1,73 @@ +package io.edpn.backend.messageprocessorlib.application.dto.eddn.journal; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.edpn.backend.messageprocessorlib.application.dto.eddn.EddnMessage; +import io.edpn.backend.messageprocessorlib.application.dto.eddn.TimestampedEddnMessage; +import io.edpn.backend.util.TimestampConverter; + +import java.time.LocalDateTime; +import java.util.List; + +public interface DockedMessage { + + String EVENT = "JournalDocked"; + + record V1( + @JsonProperty("$schemaRef") String schemaRef, + @JsonProperty("header") EddnMessage.Header header, + @JsonProperty("message") Payload message) implements TimestampedEddnMessage { + + @Override + public LocalDateTime messageTimeStamp() { + return TimestampConverter.convertToLocalDateTime(message.timestamp); + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public record Payload( + @JsonProperty("DistFromStarLS") Double distanceFromStar, + @JsonProperty("LandingPads") LandingPads landingPads, + @JsonProperty("MarketID") Long marketId, + @JsonProperty("StarPos") List starPosition, + @JsonProperty("StarSystem") String starSystem, + @JsonProperty("StationEconomies") List stationEconomies, + @JsonProperty("StationEconomy") String stationEconomy, + @JsonProperty("StationFaction") Faction stationFaction, + @JsonProperty("StationGovernment") String stationGovernment, + @JsonProperty("StationName") String stationName, + @JsonProperty("StationServices") List stationServices, + @JsonProperty("StationType") String stationType, + @JsonProperty("SystemAddress") Long systemAddress, + @JsonProperty("Taxi") Boolean taxi, + @JsonProperty("event") String event, + @JsonProperty("horizons") Boolean horizons, + @JsonProperty("odyssey") Boolean odyssey, + @JsonProperty("timestamp") String timestamp + ) implements EddnMessage.Payload { + + @JsonProperty(value = "event", access = JsonProperty.Access.READ_ONLY) + public String event() { + return EVENT; + } + + public record LandingPads( + @JsonProperty("Large") Integer large, + @JsonProperty("Medium") Integer medium, + @JsonProperty("Small") Integer small + ) { + } + + public record Economy( + @JsonProperty("Name") String name, + @JsonProperty("Proportion") Double proportion + ) { + } + + public record Faction( + @JsonProperty("Name") String name, + @JsonProperty("FactionState") String factionState + ) { + } + } + } +} diff --git a/src/test/java/io/edpn/backend/messageprocessorlib/JournalDockedMessageTest.java b/src/test/java/io/edpn/backend/messageprocessorlib/JournalDockedMessageTest.java new file mode 100644 index 0000000..d27bdf8 --- /dev/null +++ b/src/test/java/io/edpn/backend/messageprocessorlib/JournalDockedMessageTest.java @@ -0,0 +1,29 @@ +package io.edpn.backend.messageprocessorlib; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import io.edpn.backend.messageprocessorlib.application.dto.eddn.journal.DockedMessage; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.stream.Stream; + +import static io.edpn.backend.messageprocessorlib.EddnMessageTestHelper.deserialize; +import static io.edpn.backend.messageprocessorlib.EddnMessageTestHelper.readSampleJsonFiles; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class JournalDockedMessageTest { + + private static final String SAMPLES_DIRECTORY = "data/eddn-observed-messages/journal/1_dir/docked/"; + + @ParameterizedTest + @MethodSource + public void journalDockedMessageV1Deserializes(JsonNode jsonNode) throws JsonProcessingException { + DockedMessage.V1 message = deserialize(jsonNode, DockedMessage.V1.class); + assertNotNull(message); + } + + private static Stream journalDockedMessageV1Deserializes() { + return readSampleJsonFiles(SAMPLES_DIRECTORY); + } +} diff --git a/src/test/java/io/edpn/backend/messageprocessorlib/JournalScanMessageTest.java b/src/test/java/io/edpn/backend/messageprocessorlib/JournalScanMessageTest.java index ab4d5dc..643e3e9 100644 --- a/src/test/java/io/edpn/backend/messageprocessorlib/JournalScanMessageTest.java +++ b/src/test/java/io/edpn/backend/messageprocessorlib/JournalScanMessageTest.java @@ -14,16 +14,16 @@ public class JournalScanMessageTest { - private static final String SAMPLES_DIRECTORY = "data/eddn-observed-messages/journal/scan/"; + private static final String SAMPLES_DIRECTORY = "data/eddn-observed-messages/journal/1_dir/scan/"; @ParameterizedTest @MethodSource - public void fssSignalDiscoveredMessageV1Deserializes(JsonNode jsonNode) throws JsonProcessingException { + public void journalScanMessageV1Deserializes(JsonNode jsonNode) throws JsonProcessingException { ScanMessage.V1 message = deserialize(jsonNode, ScanMessage.V1.class); assertNotNull(message); } - private static Stream fssSignalDiscoveredMessageV1Deserializes() { + private static Stream journalScanMessageV1Deserializes() { return readSampleJsonFiles(SAMPLES_DIRECTORY); } } diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/1.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/1.json new file mode 100644 index 0000000..8989772 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/1.json @@ -0,0 +1,70 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:02:52.541242Z", + "softwareName": "EDDiscovery", + "softwareVersion": "16.2.0.0", + "uploaderID": "a363c3d9ac662a48937942bff76d2d476ec76371" + }, + "message": { + "DistFromStarLS": 829.334255, + "LandingPads": { + "Large": 0, + "Medium": 1, + "Small": 4 + }, + "MarketID": 3229466880, + "StarPos": [ + 61.28125, + 115.875, + -0.5625 + ], + "StarSystem": "Kungkalenja", + "StationEconomies": [ + { + "Name": "$economy_Industrial;", + "Proportion": 1.0 + } + ], + "StationEconomy": "$economy_Industrial;", + "StationFaction": { + "Name": "Kungkalenja Silver Federal Ltd" + }, + "StationGovernment": "$government_Corporate;", + "StationName": "Piaget Hub", + "StationServices": [ + "dock", + "autodock", + "commodities", + "contacts", + "exploration", + "missions", + "outfitting", + "crewlounge", + "rearm", + "refuel", + "engineer", + "missionsgenerated", + "facilitator", + "flightcontroller", + "stationoperations", + "powerplay", + "searchrescue", + "stationMenu", + "livery", + "socialspace", + "bartender", + "pioneersupplies", + "apexinterstellar" + ], + "StationType": "Outpost", + "SystemAddress": 2870783452585, + "Taxi": false, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:02:47Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/2.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/2.json new file mode 100644 index 0000000..aa9b4c8 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/2.json @@ -0,0 +1,78 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:02:52.929362Z", + "softwareName": "E:D Market Connector [Windows]", + "softwareVersion": "5.9.5", + "uploaderID": "5e1b20dfcdcd52d9ab5275c04d4413770874e220" + }, + "message": { + "DistFromStarLS": 8924.504273, + "LandingPads": { + "Large": 6, + "Medium": 12, + "Small": 7 + }, + "MarketID": 3226769408, + "Multicrew": false, + "StarPos": [ + -68.59375, + -7.03125, + 49.6875 + ], + "StarSystem": "Chimba", + "StationAllegiance": "Federation", + "StationEconomies": [ + { + "Name": "$economy_Refinery;", + "Proportion": 1.0 + } + ], + "StationEconomy": "$economy_Refinery;", + "StationFaction": { + "FactionState": "CivilWar", + "Name": "Chimba Public Industries" + }, + "StationGovernment": "$government_Corporate;", + "StationName": "Hurley Port", + "StationServices": [ + "dock", + "autodock", + "commodities", + "contacts", + "exploration", + "missions", + "outfitting", + "crewlounge", + "rearm", + "refuel", + "repair", + "shipyard", + "tuning", + "engineer", + "missionsgenerated", + "flightcontroller", + "stationoperations", + "powerplay", + "searchrescue", + "stationMenu", + "shop", + "livery", + "socialspace", + "bartender", + "vistagenomics", + "pioneersupplies", + "apexinterstellar", + "frontlinesolutions" + ], + "StationType": "Orbis", + "SystemAddress": 7266950456761, + "Taxi": false, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:02:52Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/3.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/3.json new file mode 100644 index 0000000..777f4c6 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/3.json @@ -0,0 +1,66 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:02:53.351460Z", + "softwareName": "EDO Materials Helper", + "softwareVersion": "2.44", + "uploaderID": "37bcdf85deeb91c7e3bac76bfd1d7779845f7cf3" + }, + "message": { + "DistFromStarLS": 18.709711, + "LandingPads": { + "Large": 8, + "Medium": 4, + "Small": 4 + }, + "MarketID": 3708440320, + "StarPos": [ + -43.375, + 1.0, + -15.125 + ], + "StarSystem": "LFT 1748", + "StationEconomies": [ + { + "Name": "$economy_Carrier;", + "Proportion": 1.0 + } + ], + "StationEconomy": "$economy_Carrier;", + "StationFaction": { + "Name": "FleetCarrier" + }, + "StationGovernment": "$government_Carrier;", + "StationName": "TBB-0TJ", + "StationServices": [ + "dock", + "autodock", + "commodities", + "contacts", + "exploration", + "crewlounge", + "rearm", + "refuel", + "repair", + "engineer", + "flightcontroller", + "stationoperations", + "stationMenu", + "carriermanagement", + "carrierfuel", + "voucherredemption", + "socialspace", + "bartender", + "vistagenomics", + "pioneersupplies" + ], + "StationType": "FleetCarrier", + "SystemAddress": 22660650182049, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:02:36Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/4.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/4.json new file mode 100644 index 0000000..58613f5 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/4.json @@ -0,0 +1,63 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:03:02.051545Z", + "softwareName": "E:D Market Connector [Windows]", + "softwareVersion": "5.9.5", + "uploaderID": "e93fbce0913034a21fd5276aaaf8d890ea50d453" + }, + "message": { + "DistFromStarLS": 0.0, + "LandingPads": { + "Large": 8, + "Medium": 4, + "Small": 4 + }, + "MarketID": 3703076608, + "Multicrew": false, + "StarPos": [ + -6.03125, + -30.375, + -59.03125 + ], + "StarSystem": "Fujin", + "StationEconomies": [ + { + "Name": "$economy_Carrier;", + "Proportion": 1.0 + } + ], + "StationEconomy": "$economy_Carrier;", + "StationFaction": { + "Name": "FleetCarrier" + }, + "StationGovernment": "$government_Carrier;", + "StationName": "T2B-GTY", + "StationServices": [ + "dock", + "autodock", + "commodities", + "contacts", + "crewlounge", + "rearm", + "refuel", + "repair", + "engineer", + "flightcontroller", + "stationoperations", + "stationMenu", + "carriermanagement", + "carrierfuel", + "socialspace" + ], + "StationType": "FleetCarrier", + "SystemAddress": 3068494072163, + "Taxi": false, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:03:00Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/5.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/5.json new file mode 100644 index 0000000..db54ace --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/5.json @@ -0,0 +1,76 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:03:05.437533Z", + "softwareName": "EDDiscovery", + "softwareVersion": "16.2.0.0", + "uploaderID": "dc3a5631449d834e7223fd89a8f780777d0f9c38" + }, + "message": { + "DistFromStarLS": 358.072575, + "LandingPads": { + "Large": 7, + "Medium": 12, + "Small": 6 + }, + "MarketID": 3221477376, + "StarPos": [ + -69.46875, + -47.0, + -50.03125 + ], + "StarSystem": "Wonorne Nu", + "StationEconomies": [ + { + "Name": "$economy_Agri;", + "Proportion": 1.0 + } + ], + "StationEconomy": "$economy_Agri;", + "StationFaction": { + "Name": "Brotherhood of Terra Mater" + }, + "StationGovernment": "$government_Anarchy;", + "StationName": "Nowak Hub", + "StationServices": [ + "dock", + "autodock", + "blackmarket", + "commodities", + "contacts", + "exploration", + "missions", + "outfitting", + "crewlounge", + "rearm", + "refuel", + "repair", + "shipyard", + "tuning", + "engineer", + "missionsgenerated", + "facilitator", + "flightcontroller", + "stationoperations", + "powerplay", + "stationMenu", + "shop", + "livery", + "socialspace", + "bartender", + "vistagenomics", + "pioneersupplies", + "apexinterstellar", + "frontlinesolutions" + ], + "StationType": "Coriolis", + "SystemAddress": 3657131070154, + "Taxi": true, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:03:02Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/6.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/6.json new file mode 100644 index 0000000..854ebb3 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/6.json @@ -0,0 +1,80 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:03:28.443465Z", + "softwareName": "EDO Materials Helper", + "softwareVersion": "2.44", + "uploaderID": "5f6b8af22650531b1c93056ca776cc43e719a933" + }, + "message": { + "DistFromStarLS": 258.311311, + "LandingPads": { + "Large": 9, + "Medium": 18, + "Small": 17 + }, + "MarketID": 3221575424, + "StarPos": [ + -99.25, + -100.96875, + 20.40625 + ], + "StarSystem": "Harma", + "StationEconomies": [ + { + "Name": "$economy_Industrial;", + "Proportion": 0.8 + }, + { + "Name": "$economy_Refinery;", + "Proportion": 0.2 + } + ], + "StationEconomy": "$economy_Industrial;", + "StationFaction": { + "FactionState": "Boom", + "Name": "Harma Silver Cartel" + }, + "StationGovernment": "$government_Anarchy;", + "StationName": "Gabriel Enterprise", + "StationServices": [ + "dock", + "autodock", + "blackmarket", + "commodities", + "contacts", + "exploration", + "missions", + "outfitting", + "crewlounge", + "rearm", + "refuel", + "repair", + "shipyard", + "tuning", + "engineer", + "missionsgenerated", + "facilitator", + "flightcontroller", + "stationoperations", + "powerplay", + "stationMenu", + "shop", + "livery", + "socialspace", + "bartender", + "vistagenomics", + "pioneersupplies", + "apexinterstellar", + "frontlinesolutions" + ], + "StationType": "Coriolis", + "SystemAddress": 4481764758234, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:03:27Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/7.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/7.json new file mode 100644 index 0000000..8d1b2f3 --- /dev/null +++ b/src/test/resources/data/eddn-observed-messages/journal/1_dir/docked/7.json @@ -0,0 +1,76 @@ +{ + "$schemaRef": "https://eddn.edcd.io/schemas/journal/1", + "header": { + "gamebuild": "r297330/r0 ", + "gameversion": "4.0.0.1700", + "gatewayTimestamp": "2023-11-23T21:04:49.225229Z", + "softwareName": "E:D Market Connector [Windows]", + "softwareVersion": "5.9.5", + "uploaderID": "5d61041283d1bed0761bce4834c31aff132b5b28" + }, + "message": { + "DistFromStarLS": 7.459047, + "LandingPads": { + "Large": 0, + "Medium": 1, + "Small": 2 + }, + "MarketID": 3227575040, + "Multicrew": false, + "StarPos": [ + 27.875, + -19.4375, + -149.625 + ], + "StarSystem": "Koljak", + "StationEconomies": [ + { + "Name": "$economy_Extraction;", + "Proportion": 0.83 + }, + { + "Name": "$economy_Refinery;", + "Proportion": 0.17 + } + ], + "StationEconomy": "$economy_Extraction;", + "StationFaction": { + "FactionState": "Boom", + "Name": "THE AZGHARIE" + }, + "StationGovernment": "$government_Democracy;", + "StationName": "Clayton Survey", + "StationServices": [ + "dock", + "autodock", + "blackmarket", + "commodities", + "contacts", + "exploration", + "missions", + "outfitting", + "crewlounge", + "rearm", + "refuel", + "engineer", + "missionsgenerated", + "flightcontroller", + "stationoperations", + "powerplay", + "searchrescue", + "stationMenu", + "livery", + "socialspace", + "bartender", + "pioneersupplies", + "apexinterstellar" + ], + "StationType": "Outpost", + "SystemAddress": 2870246122857, + "Taxi": false, + "event": "Docked", + "horizons": true, + "odyssey": true, + "timestamp": "2023-11-23T21:04:48Z" + } +} \ No newline at end of file diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/1.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/1.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/1.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/1.json diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/2.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/2.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/2.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/2.json diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/3.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/3.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/3.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/3.json diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/4.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/4.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/4.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/4.json diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/5.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/5.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/5.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/5.json diff --git a/src/test/resources/data/eddn-observed-messages/journal/scan/6.json b/src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/6.json similarity index 100% rename from src/test/resources/data/eddn-observed-messages/journal/scan/6.json rename to src/test/resources/data/eddn-observed-messages/journal/1_dir/scan/6.json From 95f56ac8b01cd31e4436403a83a2a01f38e66075 Mon Sep 17 00:00:00 2001 From: pveeckhout Date: Thu, 23 Nov 2023 23:40:17 +0100 Subject: [PATCH 2/5] #134 version bump --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 092d9fc..8e5b653 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'io.edpn.backend' -version = '0.0.5-SNAPSHOT' +version = '0.0.6-SNAPSHOT' compileJava.options.encoding = 'UTF-8' java { From dc22c1653a0adc6d03d52715704b12b026811757 Mon Sep 17 00:00:00 2001 From: pveeckhout Date: Sat, 25 Nov 2023 10:08:17 +0100 Subject: [PATCH 3/5] #134 starPosition from List to Array --- .../application/dto/eddn/journal/DockedMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java index 5edef28..26870c0 100644 --- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java @@ -28,7 +28,7 @@ public record Payload( @JsonProperty("DistFromStarLS") Double distanceFromStar, @JsonProperty("LandingPads") LandingPads landingPads, @JsonProperty("MarketID") Long marketId, - @JsonProperty("StarPos") List starPosition, + @JsonProperty("StarPos") Double[] starPosition, @JsonProperty("StarSystem") String starSystem, @JsonProperty("StationEconomies") List stationEconomies, @JsonProperty("StationEconomy") String stationEconomy, From 5430ea51f215901ddc1fb71930fbf57e27bbf413 Mon Sep 17 00:00:00 2001 From: pveeckhout Date: Wed, 29 Nov 2023 23:42:39 +0100 Subject: [PATCH 4/5] #134 removing duplicate event --- build.gradle | 2 +- .../application/dto/eddn/journal/DockedMessage.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8e5b653..74abcb9 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } ext { - backendUtilVersion = '0.0.4-SNAPSHOT' + backendUtilVersion = '0.1.0-SNAPSHOT' jacksonVersion = '2.14.2' junitJupiterVersion = "5.9.3" } diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java index 26870c0..ca9a311 100644 --- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java +++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/journal/DockedMessage.java @@ -39,7 +39,6 @@ public record Payload( @JsonProperty("StationType") String stationType, @JsonProperty("SystemAddress") Long systemAddress, @JsonProperty("Taxi") Boolean taxi, - @JsonProperty("event") String event, @JsonProperty("horizons") Boolean horizons, @JsonProperty("odyssey") Boolean odyssey, @JsonProperty("timestamp") String timestamp From 671b72da1fd38e490318b88f5f58e0800074c481 Mon Sep 17 00:00:00 2001 From: pveeckhout Date: Wed, 29 Nov 2023 23:45:53 +0100 Subject: [PATCH 5/5] #134 version bump backend-util --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 74abcb9..b2174eb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'io.edpn.backend' -version = '0.0.6-SNAPSHOT' +version = '0.1.0-SNAPSHOT' compileJava.options.encoding = 'UTF-8' java { @@ -32,7 +32,7 @@ repositories { } ext { - backendUtilVersion = '0.1.0-SNAPSHOT' + backendUtilVersion = '0.2.0-SNAPSHOT' jacksonVersion = '2.14.2' junitJupiterVersion = "5.9.3" }