From 968b4c37e9994821309bf36f3d213b0dc4a63a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Mon, 14 Dec 2020 15:08:54 +0100 Subject: [PATCH] RED-811: Sort by filename --- .../report/v1/server/service/ReportGenerationService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java index c481bd4..3d1f756 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java @@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.report.v1.server.service; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -24,6 +25,7 @@ import com.iqser.red.service.redaction.report.v1.server.client.LegalBasisMapping import com.iqser.red.service.redaction.report.v1.server.utils.ResourceLoader; import com.iqser.red.service.redaction.v1.model.ManualRedactionType; import com.iqser.red.service.redaction.v1.model.Rectangle; +import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.Status; import lombok.RequiredArgsConstructor; @@ -79,7 +81,7 @@ public class ReportGenerationService { run.setText("Applied rules: EFSA 1 (Vertebrate Authors)"); run.setFontSize(10); - multiFileRedactionLog.getRedactionLogs().forEach(fileRedactionLog -> { + multiFileRedactionLog.getRedactionLogs().stream().sorted(Comparator.comparing(RedactionLog::getFilename)).forEach(fileRedactionLog -> { fileRedactionLog.getRedactionLogEntry().forEach(entry -> {