From 2b3936c09b4883129ba02c1524883be5364e97e9 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 13 Nov 2024 11:51:19 +0100 Subject: [PATCH] RED-9139: move document to module in redaction-service * add feature version --- .../layoutparser/processor/model/AbstractPageBlock.java | 2 +- .../blockification/BlockificationPostprocessingService.java | 2 +- .../services/blockification/DocuMineBlockificationService.java | 2 +- .../layoutparser/processor/visualization/LayoutDebugLayer.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/AbstractPageBlock.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/AbstractPageBlock.java index 9c2cccb..5679e44 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/AbstractPageBlock.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/AbstractPageBlock.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.iqser.red.service.redaction.v1.server.data.LayoutEngineProto.LayoutEngine; +import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine; import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/BlockificationPostprocessingService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/BlockificationPostprocessingService.java index c0744be..f0c906a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/BlockificationPostprocessingService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/BlockificationPostprocessingService.java @@ -10,7 +10,7 @@ import java.util.Locale; import org.apache.commons.text.similarity.LevenshteinDistance; import org.springframework.stereotype.Service; -import com.iqser.red.service.redaction.v1.server.data.LayoutEngineProto.LayoutEngine; +import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; import com.knecon.fforesight.service.layoutparser.processor.model.PageBlockType; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocuMineBlockificationService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocuMineBlockificationService.java index 9e9c991..6e757d7 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocuMineBlockificationService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/blockification/DocuMineBlockificationService.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import org.springframework.stereotype.Service; -import com.iqser.red.service.redaction.v1.server.data.LayoutEngineProto.LayoutEngine; +import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine; import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; import com.knecon.fforesight.service.layoutparser.processor.model.Orientation; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutDebugLayer.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutDebugLayer.java index 1f6d4ea..7fc72c1 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutDebugLayer.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/visualization/LayoutDebugLayer.java @@ -20,6 +20,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo import com.iqser.red.service.redaction.v1.server.data.LayoutEngineProto; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document; +import com.iqser.red.service.redaction.v1.server.model.document.nodes.LayoutEngine; import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType; import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock; import com.knecon.fforesight.service.layoutparser.processor.docstrum.model.BoundingBox; @@ -391,7 +392,7 @@ public class LayoutDebugLayer extends LayoutDebugLayerConfig { document.streamAllSubNodes() .filter(node -> node.getType().equals(NodeType.HEADLINE)) - .filter(node -> node.getEngines().contains(LayoutEngineProto.LayoutEngine.OUTLINE)) + .filter(node -> node.getEngines().contains(LayoutEngine.OUTLINE)) .forEach(headline -> headline.getBBox() .forEach((page, bbox) -> getOrCreateVisualizationsOnPage(page.getNumber(), this.outlineHeadlines).getColoredRectangles() .add(new ColoredRectangle(bbox, HEADLINE_COLOR, LINE_WIDTH))));