From 43566d07b2b0a398063ef676e6823ae3842438d3 Mon Sep 17 00:00:00 2001 From: deiflaender Date: Mon, 12 Dec 2022 14:13:59 +0100 Subject: [PATCH] RSS-292: Fixed incompatible comparision in getLongestBlockOrElse in scm --- .../report/v1/server/service/RSSPoc2Service.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 c2c237b..e825c4b 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 @@ -594,16 +594,16 @@ public class RSSPoc2Service { String transformation = String.format("Longest value of type '%s' if present or else '%s'", type, elseValue); - var firstEntryOptional = redactionLog.getRedactionLogEntry() + var entries = redactionLog.getRedactionLogEntry() .stream() .filter(r -> r.getType().equals(type)) .sorted(Comparator.comparing(s -> s.getValue().length())) - .sorted(Collections.reverseOrder()) - .findFirst(); + .collect(Collectors.toList()); - if (firstEntryOptional.isPresent()) { - var firstEntry = firstEntryOptional.get(); + if (!entries.isEmpty()) { + + var firstEntry = entries.get(entries.size() - 1); return SCMComponent.builder().originalValue(firstEntry.getValue()).scmAnnotations(List.of(toScmAnnotations(firstEntry))).transformation(transformation).build(); }