Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Pull request #12: RED-811: Sort by filename

Browse Source 
Merge in RED/redaction-report-service from RED-811-1 to master

* commit '968b4c37e9994821309bf36f3d213b0dc4a63a66':
  RED-811: Sort by filename
This commit is contained in:
Dominique Eiflaender 2020-12-14 15:14:38 +01:00
commit ec911956a7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
View File

@ -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 -> {