Merge pull request #342 from org-metaeffekt/AE-1631-process-tracker-configuration-forwardsport

AE-1631: 'Forwards-port' of changes in #341

Author: karsten-klein

libraries/ae-inventory-processor/src/main/java/org/metaeffekt/core/inventory/processor/report/adapter/VulnerabilityReportAdapter.java

@@ -1029,8 +1029,8 @@ public String generateEnrichmentTimestampConfigs() {
                                     timeEntry.getProcessType(),
                                     timeEntry.getProcessName(),
                                     index.getKey()),
-                            timeEntry.getTimestamp().getFirst(),
-                            timeEntry.getTimestamp().getLast()));
+                            index.getValue().getFirst(),
+                            index.getValue().getLast()));
                     indexTimestamps.add(index);
                 }
             }

libraries/ae-inventory-processor/src/main/java/org/metaeffekt/core/inventory/processor/tracker/ProcessorTimeTracker.java

@@ -188,8 +188,13 @@ public static String generatePropertiesString(String propertyPrefix, long first,
         } else {
             sj.add(String.format(".timestamp=%d - %d\n\n", first, last));
 
-            sj.add(String.format(".date.en=%s - %s\n", formattedFirstEn, formattedLastEn));
-            sj.add(String.format(".date.de=%s - %s\n\n", formattedFirstDe, formattedLastDe));
+            if(formattedFirstEn.equals(formattedLastEn)) {
+                sj.add(String.format(".date.en=%s\n", formattedLastEn));
+                sj.add(String.format(".date.de=%s\n\n", formattedLastDe));
+            } else {
+                sj.add(String.format(".date.en=%s - %s\n", formattedFirstEn, formattedLastEn));
+                sj.add(String.format(".date.de=%s - %s\n\n", formattedFirstDe, formattedLastDe));
+            }
 
             sj.add(String.format(".datetime.en=%s - %s\n", formattedTimeFirstEn, formattedTimeLastEn));
             sj.add(String.format(".datetime.de=%s - %s\n", formattedTimeFirstDe, formattedTimeLastDe));

libraries/ae-inventory-processor/src/test/java/org/metaeffekt/core/inventory/processor/report/VulnerabilityReportAdapterTest.java

@@ -105,6 +105,8 @@ public void generateTimestampProperties030() throws IOException {
         Assert.assertTrue(s.contains("ae.vulnerability.cyclonedx.importer.datetime.de=n.a"));
         Assert.assertTrue(s.contains("ae.vulnerability.cyclonedx.importer.datetime.en=n.a"));
 
-        Assert.assertTrue(s, s.contains("ae.vulnerability.index.date.en=2025-12-12"));
+        Assert.assertTrue(s.contains("ae.vulnerability.inventory.enrichment.enriched.msrcadvisorindex.date.de=10.12.2025 - 12.12.2025"));
+
+        Assert.assertTrue(s, s.contains("ae.vulnerability.index.date.en=2025-12-10 - 2026-01-14"));
     }
 }