From 8d66e52cad38eae903cdd6b33f6cc5699baab8b3 Mon Sep 17 00:00:00 2001
From: Kilian Schuettler <kilian.schuettler@knecon.com>
Date: Tue, 18 Jul 2023 10:58:41 +0200
Subject: [PATCH] RED-7156: fix pmd

---
 .../adapter/CustomEntityCreationAdapter.java              | 8 ++++----
 .../server/redaction/service/EntityRedactionService.java  | 2 +-
 .../v1/server/document/graph/MigrationPocTest.java        | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
index d4962565..77d3139f 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/CustomEntityCreationAdapter.java
@@ -48,21 +48,21 @@ public class CustomEntityCreationAdapter {
     }
 
 
-    public Stream<RedactionEntity> toRedactionEntity(RedactionLog redactionLog, SemanticNode node) {
+    public List<RedactionEntity> toRedactionEntity(RedactionLog redactionLog, SemanticNode node) {
 
         List<EntityIdentifier> entityIdentifiers = redactionLog.getRedactionLogEntry().stream().map(EntityIdentifier::fromRedactionLogEntry).toList();
         return toRedactionEntity(entityIdentifiers, node);
     }
 
 
-    public Stream<RedactionEntity> createRedactionEntities(Set<ManualRedactionEntry> manualRedactionEntries, SemanticNode node) {
+    public List<RedactionEntity> createRedactionEntities(Set<ManualRedactionEntry> manualRedactionEntries, SemanticNode node) {
 
         List<EntityIdentifier> entityIdentifiers = manualRedactionEntries.stream().map(EntityIdentifier::fromManualRedactionEntry).toList();
         return toRedactionEntity(entityIdentifiers, node);
     }
 
 
-    private Stream<RedactionEntity> toRedactionEntity(List<EntityIdentifier> entityIdentifiers, SemanticNode node) {
+    private List<RedactionEntity> toRedactionEntity(List<EntityIdentifier> entityIdentifiers, SemanticNode node) {
 
         Set<Integer> pageNumbers = entityIdentifiers.stream().flatMap(entry -> entry.entityPosition().stream().map(RectangleWithPage::pageNumber)).collect(Collectors.toSet());
         Set<String> entryValues = entityIdentifiers.stream().map(EntityIdentifier::value).map(String::toLowerCase).collect(Collectors.toSet());
@@ -78,7 +78,7 @@ public class CustomEntityCreationAdapter {
                 .map(Optional::get)
                 .toList();
         tempEntitiesByValue.values().stream().flatMap(Collection::stream).forEach(RedactionEntity::removeFromGraph);
-        return correctEntities.stream();
+        return correctEntities;
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
index 8ecb6124..1becb046 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionService.java
@@ -77,7 +77,7 @@ public class EntityRedactionService {
     public void addManualAddRedactionEntities(Set<ManualRedactionEntry> manualRedactionEntries, Document document) {
 
         // Entities are automatically added to the DocumentGraph and don't need to be inserted again.
-        List<RedactionEntity> entities = customEntityCreationAdapter.createRedactionEntities(manualRedactionEntries, document).toList();
+        customEntityCreationAdapter.createRedactionEntities(manualRedactionEntries, document);
     }
 
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/MigrationPocTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/MigrationPocTest.java
index 658692ea..d0dbaf23 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/MigrationPocTest.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/document/graph/MigrationPocTest.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -89,7 +90,7 @@ public class MigrationPocTest extends BuildDocumentIntegrationTest {
 
         // IMPORTANT: always use the graph which is mapped from the DocumentData, since rounding errors occur during storage.
         Document document = DocumentGraphMapper.toDocumentGraph(DocumentData.fromDocument(buildGraph("files/new/crafted document.pdf")));
-        Set<RedactionEntity> migratedEntities = redactionLogAdapter.toRedactionEntity(originalRedactionLog, document).collect(Collectors.toSet());
+        redactionLogAdapter.toRedactionEntity(originalRedactionLog, document);
 
         var migratedRedactionLogEntries = redactionLogCreatorService.createRedactionLog(document, TEST_DOSSIER_TEMPLATE_ID);