diff --git a/distribution/pom.xml b/distribution/pom.xml index ca1d621f868..ad11d0baa62 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 distribution diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml index 9c2e784bc2e..40e3406a7d9 100644 --- a/examples/cascading/pom.xml +++ b/examples/cascading/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 cascading diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml index 50ff9958131..4b2b6df3403 100644 --- a/examples/ccsds-frames/pom.xml +++ b/examples/ccsds-frames/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 ccsds-frames diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml index 71560a10c1b..b71872868c6 100644 --- a/examples/cfdp-udp/pom.xml +++ b/examples/cfdp-udp/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 cfdp-udp diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml index b1930bd642d..4772daa79c9 100644 --- a/examples/cfdp/pom.xml +++ b/examples/cfdp/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 cfdp diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml index dc8a9548749..8c14f0223bb 100644 --- a/examples/perftest1/pom.xml +++ b/examples/perftest1/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 perftest1 diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml index 79be888ad7d..779694b3109 100644 --- a/examples/perftest2/pom.xml +++ b/examples/perftest2/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 perftest2 diff --git a/examples/pom.xml b/examples/pom.xml index b8dd9dde7eb..a31ad7f9839 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 org.yamcs.examples diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml index a2d5c4f6f98..1838d4b757d 100644 --- a/examples/pus/pom.xml +++ b/examples/pus/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 pus diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml index 9f0e250c7fb..a0824a1445d 100644 --- a/examples/replication1/pom.xml +++ b/examples/replication1/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 replication1 diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml index 8ea4859b98e..f88307e3b97 100644 --- a/examples/replication2/pom.xml +++ b/examples/replication2/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 replication2 diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml index bcf74934508..cfb9abe55fc 100644 --- a/examples/replication3/pom.xml +++ b/examples/replication3/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 replication3 diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml index 67eafb8fb89..56503cee7b2 100644 --- a/examples/simulation/pom.xml +++ b/examples/simulation/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 simulation diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml index cf20e69bef6..bf3e094a821 100644 --- a/examples/snippets/pom.xml +++ b/examples/snippets/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 snippets diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml index 016230bb5fe..d314cae64c9 100644 --- a/examples/templates/pom.xml +++ b/examples/templates/pom.xml @@ -5,7 +5,7 @@ org.yamcs.examples examples - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 templates diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml index dc940ea46c6..9c5af1e4988 100644 --- a/packet-viewer/pom.xml +++ b/packet-viewer/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 packet-viewer diff --git a/pom.xml b/pom.xml index 024ca620381..7b9573c16fa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 pom diff --git a/simulator/pom.xml b/simulator/pom.xml index 7f4dd87d04b..7ef38cfa3df 100644 --- a/simulator/pom.xml +++ b/simulator/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 simulator diff --git a/tests/pom.xml b/tests/pom.xml index 29765a02cef..01eae9ad65f 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 tests diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml index 23eb03b79e2..5065a77104f 100644 --- a/yamcs-api/pom.xml +++ b/yamcs-api/pom.xml @@ -4,7 +4,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-api diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml index 50d5da89e32..c617f6d36bd 100644 --- a/yamcs-client/pom.xml +++ b/yamcs-client/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-client diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml index 0a01e7c5580..3868cec087e 100644 --- a/yamcs-core/pom.xml +++ b/yamcs-core/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-core diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java index 9194a3cac58..794c009c5d6 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceTen.java @@ -30,8 +30,6 @@ import org.yamcs.yarch.YarchException; import org.yamcs.yarch.rocksdb.protobuf.Tablespace.ObjectProperties; -import com.google.gson.Gson; - public class SubServiceTen implements PusSubService { String yamcsInstance; @@ -92,12 +90,9 @@ public ObjectProperties findObject(int uniqueSignature) throws IOException { return null; } - public ArrayList generateTimetagScheduleDetailReport(long gentime, Map requestTcPacketsMap, Map props, ObjectProperties foundObject, int apid) { - long missionTime = PusTmManager.timeService.getMissionTime(); - + public ArrayList generateTimetagScheduleDetailReport(long gentime, Map requestTcPacketsMap, ObjectProperties foundObject, int apid) { String filename; String content; - Map metadata; if (foundObject == null) { filename = "timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( @@ -105,25 +100,6 @@ public ArrayList generateTimetagScheduleDetailReport(long gentime, Map(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - - // Populate properties - for (Map.Entry prop: props.entrySet()) { - if (prop.getKey() == "ReportIndex") { - List indices = new ArrayList<>(); - - indices.add(String.valueOf(prop.getValue())); - metadata.put("ReportIndices", new Gson().toJson(indices)); - continue; - } - metadata.put(prop.getKey(), prop.getValue().toString()); - } - try (StringWriter stringWriter = new StringWriter(); BufferedWriter writer = new BufferedWriter(stringWriter)) { @@ -138,16 +114,7 @@ public ArrayList generateTimetagScheduleDetailReport(long gentime, Map " + timetagScheduleDetailReportBucket.getName() : ""), e); } } else { - metadata = new HashMap<>(foundObject.getMetadataMap()); filename = foundObject.getName(); - - // Update Report indices in metadata - @SuppressWarnings("unchecked") - List indices = new Gson().fromJson(metadata.get("ReportIndices"), ArrayList.class); - - indices.add(String.valueOf(props.get("ReportIndex"))); - metadata.put("ReportIndices", new Gson().toJson(indices)); - try { // Fetch content from foundObject content = new String(timetagScheduleDetailReportBucket.getObject(filename), StandardCharsets.UTF_8); @@ -199,7 +166,7 @@ public ArrayList generateTimetagScheduleDetailReport(long gentime, Map " + timetagScheduleDetailReportBucket.getName() : ""), e); @@ -217,43 +184,26 @@ public PreparedCommand process(PreparedCommand telecommand) { public ArrayList process(TmPacket tmPacket) { PusTmCcsdsPacket pPkt = new PusTmCcsdsPacket(tmPacket.getPacket()); byte[] dataField = pPkt.getDataField(); - byte[] spareField = pPkt.getSpareField(); int apid = pPkt.getAPID(); - - Map props = new HashMap<>(); - int uniqueSignature = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime, uniqueSignatureSize); - int reportCount = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime + uniqueSignatureSize, reportCountSize); - int reportIndex = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime + uniqueSignatureSize + reportCountSize, reportIndexSize); - - props.put("UniqueSignature", uniqueSignature); - props.put("ReportIndex", reportIndex); - props.put("ReportCount", reportCount); - Map requestTcPacketsMap = getRequestTcPacketMap(dataField); // Check if a unique file already exists - ObjectProperties foundObject = null; long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); + String filename = "timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( + Instant.ofEpochSecond(generationTime), + ZoneId.of("GMT") + ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv"; + ArrayList newPayload = new ArrayList<>(); try { - foundObject = findObject(uniqueSignature); - if (foundObject == null) { - String filename = "timetagScheduleDetailReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( - Instant.ofEpochSecond(generationTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv"; - - foundObject = timetagScheduleDetailReportBucket.findObject(filename); - } + ObjectProperties foundObject = timetagScheduleDetailReportBucket.findObject(filename); + newPayload = generateTimetagScheduleDetailReport(generationTime, requestTcPacketsMap, foundObject, apid); } catch (IOException e) { - throw new UncheckedIOException("S(11, 10) | Unable to find object with UniqueSignature: " + uniqueSignature + " in bucket: " + (timetagScheduleDetailReportBucket != null ? " -> " + timetagScheduleDetailReportBucket.getName() : ""), e); + throw new UncheckedIOException("S(11, 10) | Unable to find object with filename: " + filename + " in bucket: " + (timetagScheduleDetailReportBucket != null ? " -> " + timetagScheduleDetailReportBucket.getName() : ""), e); } - // Generate the report - ArrayList newPayload = generateTimetagScheduleDetailReport(generationTime, requestTcPacketsMap, props, foundObject, apid); - // Create a new TmPacket similar S(11, 10) byte[] primaryHeader = pPkt.getPrimaryHeader(); byte[] secondaryHeader = pPkt.getSecondaryHeader(); diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java index fc823598b29..04bf69607fe 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/eleven/SubServiceThirteen.java @@ -29,8 +29,6 @@ import org.yamcs.yarch.YarchException; import org.yamcs.yarch.rocksdb.protobuf.Tablespace.ObjectProperties; -import com.google.gson.Gson; - public class SubServiceThirteen implements PusSubService { String yamcsInstance; @@ -91,12 +89,9 @@ public ObjectProperties findObject(int uniqueSignature) throws IOException { return null; } - public void generateTimetagScheduleSummaryReport(long gentime, Map> requestTcPacketsMap, Map props, ObjectProperties foundObject, int apid) { - long missionTime = PusTmManager.timeService.getMissionTime(); - + public void generateTimetagScheduleSummaryReport(long gentime, Map> requestTcPacketsMap, ObjectProperties foundObject, int apid) { String filename; String content; - Map metadata; if (foundObject == null) { filename = "timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( @@ -104,25 +99,6 @@ public void generateTimetagScheduleSummaryReport(long gentime, Map(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - - // Populate properties - for (Map.Entry prop: props.entrySet()) { - if (prop.getKey() == "ReportIndex") { - List indices = new ArrayList<>(); - - indices.add(String.valueOf(prop.getValue())); - metadata.put("ReportIndices", new Gson().toJson(indices)); - continue; - } - metadata.put(prop.getKey(), prop.getValue().toString()); - } - try (StringWriter stringWriter = new StringWriter(); BufferedWriter writer = new BufferedWriter(stringWriter)) { @@ -138,16 +114,8 @@ public void generateTimetagScheduleSummaryReport(long gentime, Map(foundObject.getMetadataMap()); filename = foundObject.getName(); - // Update Report indices in metadata - @SuppressWarnings("unchecked") - List indices = new Gson().fromJson(metadata.get("ReportIndices"), ArrayList.class); - - indices.add(String.valueOf(props.get("ReportIndex"))); - metadata.put("ReportIndices", new Gson().toJson(indices)); - try { // Fetch content from foundObject content = new String(timetagScheduleSummaryReportBucket.getObject(filename), StandardCharsets.UTF_8); @@ -184,7 +152,7 @@ public void generateTimetagScheduleSummaryReport(long gentime, Map " + timetagScheduleSummaryReportBucket.getName() : ""), e); @@ -200,19 +168,9 @@ public PreparedCommand process(PreparedCommand telecommand) { public ArrayList process(TmPacket tmPacket) { PusTmCcsdsPacket pPkt = new PusTmCcsdsPacket(tmPacket.getPacket()); byte[] dataField = pPkt.getDataField(); - byte[] spareField = pPkt.getSpareField(); int apid = pPkt.getAPID(); - Map props = new HashMap<>(); - int uniqueSignature = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime, uniqueSignatureSize); - int reportCount = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime + uniqueSignatureSize, reportCountSize); - int reportIndex = (int) ByteArrayUtils.decodeCustomInteger(spareField, PusTmManager.spareOffsetForFractionTime + uniqueSignatureSize + reportCountSize, reportIndexSize); - - props.put("UniqueSignature", uniqueSignature); - props.put("ReportIndex", reportIndex); - props.put("ReportCount", reportCount); - int numOfReports = (int) ByteArrayUtils.decodeCustomInteger(dataField, 0, ServiceEleven.reportCountSize); byte[] reportArr = Arrays.copyOfRange(dataField, ServiceEleven.reportCountSize, dataField.length); @@ -227,24 +185,18 @@ public ArrayList process(TmPacket tmPacket) { } // Check if a unique file already exists - try { - long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); - ObjectProperties foundObject = findObject(uniqueSignature); - - if (foundObject == null) { - String filename = "timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( - Instant.ofEpochSecond(generationTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv"; - - foundObject = timetagScheduleSummaryReportBucket.findObject(filename); - } + long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); + String filename = "timetagScheduleSummaryReport/" + folders.get(apid) + "/" + LocalDateTime.ofInstant( + Instant.ofEpochSecond(generationTime), + ZoneId.of("GMT") + ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv";; - // Generate the report - generateTimetagScheduleSummaryReport(generationTime, requestTcPacketsMap, props, foundObject, apid); + try { + ObjectProperties foundObject = timetagScheduleSummaryReportBucket.findObject(filename); + generateTimetagScheduleSummaryReport(generationTime, requestTcPacketsMap, foundObject, apid); } catch (IOException e) { - throw new UncheckedIOException("S(11, 13) | Unable to find object with UniqueSignature: " + uniqueSignature + " in bucket: " + (timetagScheduleSummaryReportBucket != null ? " -> " + timetagScheduleSummaryReportBucket.getName() : ""), e); + throw new UncheckedIOException("S(11, 13) | Unable to find object with name: " + filename + " in bucket: " + (timetagScheduleSummaryReportBucket != null ? " -> " + timetagScheduleSummaryReportBucket.getName() : ""), e); } ArrayList pPkts = new ArrayList<>(); diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java index ed3bf78097c..4cb92c11d88 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceNineteen.java @@ -87,19 +87,11 @@ public PreparedCommand process(PreparedCommand telecommand) { } public void generatePacketStoredStatusReport(long generationTime, Map packetStoreReportMap) { - long missionTime = PusTmManager.timeService.getMissionTime(); String filename = "packetStoreStatusReport/" + LocalDateTime.ofInstant( Instant.ofEpochSecond(generationTime), ZoneId.of("GMT") ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".csv"; - // Populate metadata - HashMap metadata = new HashMap<>(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - try (StringWriter stringWriter = new StringWriter(); BufferedWriter writer = new BufferedWriter(stringWriter)) { @@ -120,7 +112,7 @@ public void generatePacketStoredStatusReport(long generationTime, Map " + packetStoreStatusReportBucket.getName() : ""), e); diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java index 0dedb008f63..992a4719818 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/fifteen/SubServiceThirteen.java @@ -78,15 +78,6 @@ public PreparedCommand process(PreparedCommand telecommand) { } public void generatePacketStoredSummaryReport(long generationTime, Map packetStoreReportMap) { - long missionTime = PusTmManager.timeService.getMissionTime(); - - // Populate metadata - HashMap metadata = new HashMap<>(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - for (Map.Entry packetStoreReport: packetStoreReportMap.entrySet()) { String filename = "packetStoreSummaryReport/" + packetStoreMap.get(packetStoreReport.getKey()) + "/" + LocalDateTime.ofInstant( Instant.ofEpochSecond(generationTime), @@ -124,7 +115,7 @@ public void generatePacketStoredSummaryReport(long generationTime, Map " + packetStoreSummaryReportBucket.getName() : ""), e); diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java index e59c2936111..d30b2ecad37 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceNine.java @@ -90,20 +90,11 @@ public ArrayList process(TmPacket tmPacket) { int protocolSpecificData = ByteArrayUtils.decodeUnsignedShort(auxillaryData, (pactIDSize + physicalDeviceIDSize)); long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); - long missionTime = PusTmManager.timeService.getMissionTime(); String filename = "physicalDeviceReport/" + LocalDateTime.ofInstant( Instant.ofEpochSecond(generationTime), ZoneId.of("GMT") ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".json"; - - // Populate metadata - HashMap metadata = new HashMap<>(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - // Save file to physicalDeviceReport bucket try { @@ -124,7 +115,7 @@ public ArrayList process(TmPacket tmPacket) { currentDeviceReport.put("dataAcquired", dataAcquired); physicalDeviceReportJSON.put(currentDeviceReport); - physicalDeviceReportBucket.putObject(filename, "json", metadata, physicalDeviceReportJSON.toString().getBytes(StandardCharsets.UTF_8)); + physicalDeviceReportBucket.putObject(filename, "json", null, physicalDeviceReportJSON.toString().getBytes(StandardCharsets.UTF_8)); } catch(IOException e) { throw new UncheckedIOException("S(2, 9)| Cannot save / update physical device ID dump report in bucket: " + filename + (physicalDeviceReportBucket != null ? " -> " + physicalDeviceReportBucket.getName() : ""), e); diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceSix.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceSix.java index 6a9b8ea8dd1..0e093316fc1 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceSix.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceSix.java @@ -77,27 +77,19 @@ public ArrayList process(TmPacket tmPacket) { registerValues.put(address, value); } - long missionTime = PusTmManager.timeService.getMissionTime(); long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); String filename = "deviceRegisterReport/" + LocalDateTime.ofInstant( Instant.ofEpochSecond(generationTime), ZoneId.of("GMT") ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".json"; - - // Populate metadata - HashMap metadata = new HashMap<>(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - + // Serialize the HashMap to JSONString String registerDump = gson.toJson(registerValues); // Save file to deviceRegisterReport bucket try { - registerDumpBucket.putObject(filename, "json", metadata, registerDump.getBytes(StandardCharsets.UTF_8)); + registerDumpBucket.putObject(filename, "json", null, registerDump.getBytes(StandardCharsets.UTF_8)); } catch(IOException e) { throw new UncheckedIOException("S(2, 6) | Cannot save device register dump report in bucket: " + filename + (registerDumpBucket != null ? " -> " + registerDumpBucket.getName() : ""), e); } diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceTwelve.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceTwelve.java index 5575c8a9e10..cc663605e55 100644 --- a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceTwelve.java +++ b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/two/SubServiceTwelve.java @@ -90,20 +90,11 @@ public ArrayList process(TmPacket tmPacket) { int parameterIDData = ByteArrayUtils.decodeUnsignedShort(auxillaryData, (pactIDSize + logicalDeviceIDSize)); long generationTime = ByteArrayUtils.decodeCustomInteger(pPkt.getGenerationTime(), 0, PusTmManager.absoluteTimeLength); - long missionTime = PusTmManager.timeService.getMissionTime(); String filename = "logicalDeviceReport/" + LocalDateTime.ofInstant( Instant.ofEpochSecond(generationTime), ZoneId.of("GMT") ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'")) + ".json"; - - // Populate metadata - HashMap metadata = new HashMap<>(); - metadata.put("CreationTime", LocalDateTime.ofInstant( - Instant.ofEpochMilli(missionTime), - ZoneId.of("GMT") - ).format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'"))); - // Save file to logicalDeviceReport bucket try { @@ -124,7 +115,7 @@ public ArrayList process(TmPacket tmPacket) { currentDeviceReport.put("dataAcquired", dataAcquired); logicalDeviceReportJSON.put(currentDeviceReport); - logicalDeviceReportBucket.putObject(filename, "json", metadata, logicalDeviceReportJSON.toString().getBytes(StandardCharsets.UTF_8)); + logicalDeviceReportBucket.putObject(filename, "json", null, logicalDeviceReportJSON.toString().getBytes(StandardCharsets.UTF_8)); } catch(IOException e) { throw new UncheckedIOException("S(2, 12) | Cannot save / update logical device ID dump report in bucket: " + filename + (logicalDeviceReportBucket != null ? " -> " + logicalDeviceReportBucket.getName() : ""), e); diff --git a/yamcs-tse/pom.xml b/yamcs-tse/pom.xml index e5844dc624b..95b4a4669e5 100644 --- a/yamcs-tse/pom.xml +++ b/yamcs-tse/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-tse diff --git a/yamcs-web/pom.xml b/yamcs-web/pom.xml index 6c068469edd..ad59a17f18c 100644 --- a/yamcs-web/pom.xml +++ b/yamcs-web/pom.xml @@ -3,7 +3,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-web diff --git a/yamcs-xtce/pom.xml b/yamcs-xtce/pom.xml index ccb65a17f9f..c1a0afd265c 100644 --- a/yamcs-xtce/pom.xml +++ b/yamcs-xtce/pom.xml @@ -5,7 +5,7 @@ org.yamcs yamcs - 5.10.9-Pixxel-8.0.0 + 5.10.9-Pixxel-8.1.0 yamcs-xtce