From cf21b75f2e1a75250003ce085120bf40b052a891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 10 Dec 2024 12:41:36 +0100 Subject: [PATCH] RED-10644: Fixed dublicated entries with whitespace at the end --- .../v1/server/service/document/EntityCreationService.java | 4 ++-- .../redaction/v1/server/AbstractRedactionIntegrationTest.java | 2 +- .../red/service/redaction/v1/server/AnalysisEnd2EndTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java index 6fecda2b..cf0f1900 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/EntityCreationService.java @@ -985,11 +985,11 @@ public class EntityCreationService { return Optional.empty(); // Entity has been recategorized and should not be created at all. } TextEntity existingEntity = optionalTextEntity.get(); - if (existingEntity.getTextRange().equals(textRange)) { + if (existingEntity.getTextRange().equals(trimmedTextRange)) { return optionalTextEntity; // exactly the same entity, return directly } if (!existingEntity.resized()) { - addDuplicateEntityToGraph(existingEntity, textRange, node); + addDuplicateEntityToGraph(existingEntity, trimmedTextRange, node); return optionalTextEntity; // If Entity has not been resized, insert as duplicate at appropriate position } return Optional.empty(); // Entity has been resized, if there are duplicates they should be treated there diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java index df024380..dd853fad 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java @@ -243,7 +243,7 @@ public abstract class AbstractRedactionIntegrationTest { public static void init() { synchronized (PDFNet.class) { - PDFNet.initialize("demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a"); + PDFNet.initialize("demo:admin@knecon.com:7ed45ca80200000000c1e1765b94afccf5bbc0cb8582fd932c602e286a"); } } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisEnd2EndTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisEnd2EndTest.java index d1b66a84..6b6047c0 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisEnd2EndTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AnalysisEnd2EndTest.java @@ -169,7 +169,7 @@ import lombok.extern.slf4j.Slf4j; public static void init() { synchronized (PDFNet.class) { - PDFNet.initialize("demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a"); + PDFNet.initialize("demo:admin@knecon.com:7ed45ca80200000000c1e1765b94afccf5bbc0cb8582fd932c602e286a"); } }