From 56c07a449196f501d487ab512e9280bb2a06a673 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 8 Mar 2024 16:23:27 +0200 Subject: [PATCH] CLARI-30 - identifier fix for clarifynd --- .../layoutparser/processor/LayoutParsingPipeline.java | 4 ++-- .../service/layoutparser/server/BdrJsonBuildTest.java | 3 ++- .../server/HeadlinesGoldStandardIntegrationTest.java | 3 ++- .../server/graph/DocumentGraphJsonWritingTest.java | 3 ++- .../layoutparser/server/graph/ViewerDocumentTest.java | 3 ++- .../server/segmentation/PdfSegmentationServiceTest.java | 2 +- .../server/services/RulingCleaningServiceTest.java | 5 +++-- .../service/layoutparser/server/utils/BuildDocumentTest.java | 3 ++- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java index a252e89..b021e37 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java @@ -118,7 +118,7 @@ public class LayoutParsingPipeline { imageServiceResponse, tableServiceResponse, visualLayoutParsingResponse, - layoutParsingRequest.identifier().toString()); + layoutParsingRequest.identifier()); log.info("Building document graph for {}", layoutParsingRequest.identifier()); @@ -207,7 +207,7 @@ public class LayoutParsingPipeline { ImageServiceResponse imageServiceResponse, TableServiceResponse tableServiceResponse, VisualLayoutParsingResponse visualLayoutParsingResponse, - String identifier) { + Map identifier) { PDDocument originDocument = openDocument(originFile); addNumberOfPagesToTrace(originDocument.getNumberOfPages(), Files.size(originFile.toPath())); diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/BdrJsonBuildTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/BdrJsonBuildTest.java index c80bfbd..cb8bf7e 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/BdrJsonBuildTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/BdrJsonBuildTest.java @@ -11,6 +11,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.Duration; import java.util.List; +import java.util.Map; import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; @@ -54,7 +55,7 @@ public class BdrJsonBuildTest extends AbstractTest { new ImageServiceResponse(), new TableServiceResponse(), new VisualLayoutParsingResponse(), - file.toString())); + Map.of("file",file.toString()))); } diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/HeadlinesGoldStandardIntegrationTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/HeadlinesGoldStandardIntegrationTest.java index 34915e9..566364f 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/HeadlinesGoldStandardIntegrationTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/HeadlinesGoldStandardIntegrationTest.java @@ -3,6 +3,7 @@ package com.knecon.fforesight.service.layoutparser.server; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -101,7 +102,7 @@ public class HeadlinesGoldStandardIntegrationTest { new ImageServiceResponse(), new TableServiceResponse(), new VisualLayoutParsingResponse(), - filePath)); + Map.of("file",filePath))); var foundHeadlines = documentGraph.streamAllSubNodes() .map(SemanticNode::getHeadline) diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphJsonWritingTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphJsonWritingTest.java index 51b12cb..e1f078e 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphJsonWritingTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphJsonWritingTest.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileOutputStream; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -61,7 +62,7 @@ public class DocumentGraphJsonWritingTest extends BuildDocumentTest { new ImageServiceResponse(), new TableServiceResponse(), new VisualLayoutParsingResponse(), - filename.toFile().toString())); + Map.of("file",filename.toFile().toString()))); DocumentData documentData = DocumentDataMapper.toDocumentData(documentGraph); ObjectMapper mapper = ObjectMapperFactory.create(); diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java index 89d489f..3153952 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java @@ -2,6 +2,7 @@ package com.knecon.fforesight.service.layoutparser.server.graph; import java.io.File; import java.nio.file.Path; +import java.util.Map; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -58,7 +59,7 @@ public class ViewerDocumentTest extends BuildDocumentTest { new ImageServiceResponse(), tableResponse, new VisualLayoutParsingResponse(), - Path.of(fileName).getFileName().toFile().toString()); + Map.of("file",Path.of(fileName).getFileName().toFile().toString())); ViewerDocumentService viewerDocumentService = new ViewerDocumentService(null); LayoutGridService layoutGridService = new LayoutGridService(viewerDocumentService); Document document = DocumentGraphFactory.buildDocumentGraph(LayoutParsingType.DOCUMINE, classificationDocument); diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/segmentation/PdfSegmentationServiceTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/segmentation/PdfSegmentationServiceTest.java index 8db6fdc..739d0fa 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/segmentation/PdfSegmentationServiceTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/segmentation/PdfSegmentationServiceTest.java @@ -61,7 +61,7 @@ public class PdfSegmentationServiceTest extends AbstractTest { new ImageServiceResponse(), tableServiceResponse, new VisualLayoutParsingResponse(), - "document"); + Map.of("file","document")); redactManagerClassificationService.classifyDocument(classificationDocument); diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/services/RulingCleaningServiceTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/services/RulingCleaningServiceTest.java index ca08fbd..00955f0 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/services/RulingCleaningServiceTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/services/RulingCleaningServiceTest.java @@ -7,6 +7,7 @@ import java.nio.file.Path; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import org.apache.pdfbox.Loader; @@ -105,14 +106,14 @@ public class RulingCleaningServiceTest extends BuildDocumentTest { new ImageServiceResponse(), new TableServiceResponse(), new VisualLayoutParsingResponse(), - filename.toFile().toString())); + Map.of("file",filename.toFile().toString()))); Document documentGraphAfter = DocumentGraphFactory.buildDocumentGraph(LayoutParsingType.REDACT_MANAGER_OLD, layoutParsingPipeline.parseLayout(LayoutParsingType.REDACT_MANAGER_OLD, filename.toFile(), new ImageServiceResponse(), new TableServiceResponse(), new VisualLayoutParsingResponse(), - filename.toFile().toString())); + Map.of("file",filename.toFile().toString()))); DocumentData documentDataBefore = DocumentDataMapper.toDocumentData(documentGraphBefore); DocumentData documentDataAfter = DocumentDataMapper.toDocumentData(documentGraphAfter); if (!compareStructures(documentDataBefore.getDocumentStructure(), documentDataAfter.getDocumentStructure())) { diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BuildDocumentTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BuildDocumentTest.java index b070582..1374360 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BuildDocumentTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/BuildDocumentTest.java @@ -1,6 +1,7 @@ package com.knecon.fforesight.service.layoutparser.server.utils; import java.io.File; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; @@ -31,7 +32,7 @@ public abstract class BuildDocumentTest extends AbstractTest { layoutParsingStorageService.getImagesFile(IMAGE_FILE_ID), new TableServiceResponse(), new VisualLayoutParsingResponse(), - filename); + Map.of("file",filename)); }