diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/RSSController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/RSSController.java index 6511ce8..f130001 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/RSSController.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/RSSController.java @@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.report.v1.server.controller; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class RSSController implements RSSResource { List fileResponses = new ArrayList<>(); for (DetailedRSSFileResponse detailedRSSFileResponse : detailed.getFiles()){ String fileName = detailedRSSFileResponse.getFilename(); - Map result = new HashMap<>(); + Map result = new LinkedHashMap<>(); for(Map.Entry detailedRss : detailedRSSFileResponse.getResult().entrySet()){ if(detailedRss.getValue().getValue() != null){ result.put(detailedRss.getKey(), detailedRss.getValue().getValue()); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java index ab8a524..3501c85 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RSSPoc2Service.java @@ -580,7 +580,7 @@ public class RSSPoc2Service { var uniqueEntries = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getType().equals(type)).collect(Collectors.toSet()); - String value = uniqueEntries.stream().map(RedactionLogEntry::getValue).collect(Collectors.joining(seperator)).trim(); + String value = uniqueEntries.stream().map(RedactionLogEntry::getValue).collect(Collectors.toSet()).stream().collect(Collectors.joining(seperator)).trim(); return SCMComponent.builder() .originalValue(value)