From 299b5be385bee4c18080c72c91b899cdc3692880 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Thu, 27 Jul 2023 14:28:09 +0200 Subject: [PATCH] package refactoring in processor --- .../processor/LayoutParsingPipeline.java | 16 +++++----- .../LayoutParsingStorageService.java | 4 +-- .../graph/nodes/GenericSemanticNode.java | 5 --- .../processor/{ => model}/graph/Boundary.java | 2 +- .../{ => model}/graph/DocumentTree.java | 16 +++++----- .../{ => model}/graph/entity/EntityType.java | 2 +- .../graph/entity/RedactionEntity.java | 8 ++--- .../graph/entity/RedactionPosition.java | 4 +-- .../{ => model}/graph/nodes/Document.java | 10 +++--- .../{ => model}/graph/nodes/Footer.java | 8 ++--- .../graph/nodes/GenericSemanticNode.java | 5 +++ .../{ => model}/graph/nodes/Header.java | 8 ++--- .../{ => model}/graph/nodes/Headline.java | 8 ++--- .../{ => model}/graph/nodes/Image.java | 10 +++--- .../{ => model}/graph/nodes/ImageType.java | 2 +- .../{ => model}/graph/nodes/Page.java | 8 ++--- .../{ => model}/graph/nodes/Paragraph.java | 8 ++--- .../{ => model}/graph/nodes/Section.java | 10 +++--- .../{ => model}/graph/nodes/SemanticNode.java | 14 ++++---- .../{ => model}/graph/nodes/Table.java | 10 +++--- .../{ => model}/graph/nodes/TableCell.java | 10 +++--- .../graph/textblock/AtomicTextBlock.java | 8 ++--- .../textblock/ConcatenatedTextBlock.java | 6 ++-- .../graph/textblock/TextBlock.java | 6 ++-- .../graph/textblock/TextBlockCollector.java | 2 +- .../model/image/ClassifiedImage.java | 2 +- .../adapter/CvTableParsingAdapter.java | 6 ++-- .../adapter/ImageServiceResponseAdapter.java | 6 ++-- .../model/image/Classification.java | 2 +- .../model/image/FilterGeometry.java | 2 +- .../model/image/Filters.java | 2 +- .../model/image/Geometry.java | 2 +- .../model/image/ImageFormat.java | 2 +- .../model/image/ImageMetadata.java | 2 +- .../model/image/ImageServiceResponse.java | 2 +- .../model/image/ImageSize.java | 2 +- .../model/image/Position.java | 2 +- .../model/image/Probability.java | 2 +- .../model/table/PageInfo.java | 2 +- .../model/table/PdfTableCell.java | 2 +- .../model/table/TableCells.java | 2 +- .../model/table/TableData.java | 2 +- .../model/table/TableServiceResponse.java | 2 +- .../processor/services/PdfParsingService.java | 6 ++-- .../services/RulingCleaningService.java | 2 +- .../services/SectionGridCreatorService.java | 10 +++--- .../services/TextPositionSequenceSorter.java | 2 +- .../factory/DocumentGraphFactory.java | 24 +++++++------- .../SearchTextWithTextPositionDto.java | 4 +-- .../SearchTextWithTextPositionFactory.java | 4 +-- .../factory/SectionNodeFactory.java | 8 ++--- .../factory/TableNodeFactory.java | 14 ++++---- .../factory/TextBlockFactory.java | 8 ++--- .../mapper/redaction/DocumentDataMapper.java | 18 +++++------ .../mapper/redaction/DocumentGraphMapper.java | 32 +++++++++---------- .../mapper/redaction/PropertiesMapper.java | 10 +++--- .../mapper/taas/TaasDocumentDataMapper.java | 16 +++++----- .../parsing/LegacyPDFStreamEngine.java | 2 +- .../parsing/PDFLinesTextStripper.java | 2 +- .../parsing/PDFTextStripper.java | 2 +- .../processor/utils/IdBuilder.java | 2 +- .../utils/PdfVisualisationUtility.java | 10 +++--- .../utils/RectangleTransformations.java | 2 +- .../layoutparser/server/BdrJsonBuildTest.java | 10 +++--- .../HeadlinesGoldStandardIntegrationTest.java | 8 ++--- .../server/graph/BoundaryTest.java | 2 +- .../server/graph/BuildDocumentGraphTest.java | 4 +-- .../server/graph/DocumentDataTests.java | 2 +- .../graph/DocumentGraphJsonWritingTest.java | 8 ++--- .../graph/DocumentGraphMappingTest.java | 10 +++--- .../graph/DocumentGraphVisualizationTest.java | 4 +-- .../PdfSegmentationServiceTest.java | 10 +++--- .../server/utils/visualizations/PdfDraw.java | 10 +++--- 73 files changed, 240 insertions(+), 240 deletions(-) delete mode 100644 layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/GenericSemanticNode.java rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/Boundary.java (97%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/DocumentTree.java (88%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/entity/EntityType.java (56%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/entity/RedactionEntity.java (94%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/entity/RedactionPosition.java (76%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Document.java (85%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Footer.java (76%) create mode 100644 layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/GenericSemanticNode.java rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Header.java (76%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Headline.java (77%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Image.java (80%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/ImageType.java (85%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Page.java (83%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Paragraph.java (75%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Section.java (78%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/SemanticNode.java (95%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/Table.java (96%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/nodes/TableCell.java (80%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/textblock/AtomicTextBlock.java (96%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/textblock/ConcatenatedTextBlock.java (96%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/textblock/TextBlock.java (92%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => model}/graph/textblock/TextBlockCollector.java (92%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => python_api}/adapter/CvTableParsingAdapter.java (82%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => python_api}/adapter/ImageServiceResponseAdapter.java (91%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/Classification.java (70%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/FilterGeometry.java (60%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/Filters.java (65%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/Geometry.java (55%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/ImageFormat.java (63%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/ImageMetadata.java (72%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/ImageServiceResponse.java (87%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/ImageSize.java (63%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/Position.java (66%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/image/Probability.java (51%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/table/PageInfo.java (64%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/table/PdfTableCell.java (80%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/table/TableCells.java (72%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/table/TableData.java (70%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{adapter => python_api}/model/table/TableServiceResponse.java (80%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/DocumentGraphFactory.java (89%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/SearchTextWithTextPositionDto.java (84%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/SearchTextWithTextPositionFactory.java (98%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/SectionNodeFactory.java (95%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/TableNodeFactory.java (90%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/factory/TextBlockFactory.java (88%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/mapper/redaction/DocumentDataMapper.java (87%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/mapper/redaction/DocumentGraphMapper.java (83%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/mapper/redaction/PropertiesMapper.java (90%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/mapper/taas/TaasDocumentDataMapper.java (88%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/parsing/LegacyPDFStreamEngine.java (99%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/parsing/PDFLinesTextStripper.java (99%) rename layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/{ => services}/parsing/PDFTextStripper.java (99%) 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 64351ec..41dded9 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 @@ -10,14 +10,14 @@ import org.springframework.stereotype.Service; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; -import com.knecon.fforesight.service.layoutparser.processor.adapter.CvTableParsingAdapter; -import com.knecon.fforesight.service.layoutparser.processor.adapter.ImageServiceResponseAdapter; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.factory.DocumentGraphFactory; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.DocumentDataMapper; -import com.knecon.fforesight.service.layoutparser.processor.mapper.taas.TaasDocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.CvTableParsingAdapter; +import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.services.factory.DocumentGraphFactory; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.DocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.taas.TaasDocumentDataMapper; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument; import com.knecon.fforesight.service.layoutparser.processor.services.PdfParsingService; import com.knecon.fforesight.service.layoutparser.processor.services.SectionGridCreatorService; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java index 64d2f10..52e210c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java @@ -22,8 +22,8 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.Do import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage; import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.ResearchDocumentData; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; import com.knecon.fforesight.tenantcommons.TenantContext; import lombok.RequiredArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/GenericSemanticNode.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/GenericSemanticNode.java deleted file mode 100644 index fbffa94..0000000 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/GenericSemanticNode.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; - -public interface GenericSemanticNode extends SemanticNode { - -} diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/Boundary.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/Boundary.java similarity index 97% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/Boundary.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/Boundary.java index 5808e20..28de929 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/Boundary.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/Boundary.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph; +package com.knecon.fforesight.service.layoutparser.processor.model.graph; import static java.lang.String.format; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/DocumentTree.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/DocumentTree.java similarity index 88% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/DocumentTree.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/DocumentTree.java index 2f5f0c7..dff1f4b 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/DocumentTree.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/DocumentTree.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph; +package com.knecon.fforesight.service.layoutparser.processor.model.graph; import static java.lang.String.format; @@ -8,13 +8,13 @@ import java.util.List; import java.util.stream.Stream; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.GenericSemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/EntityType.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/EntityType.java similarity index 56% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/EntityType.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/EntityType.java index cbd484d..838996d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/EntityType.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/EntityType.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.entity; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity; public enum EntityType { ENTITY, diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionEntity.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionEntity.java similarity index 94% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionEntity.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionEntity.java index 5a1c686..bfa9f9b 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionEntity.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionEntity.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.entity; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity; import java.awt.geom.Rectangle2D; import java.util.Collection; @@ -11,9 +11,9 @@ import java.util.Map; import java.util.Set; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; import com.knecon.fforesight.service.layoutparser.processor.utils.IdBuilder; import lombok.AccessLevel; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionPosition.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionPosition.java similarity index 76% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionPosition.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionPosition.java index 5d050d4..dbf104c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionPosition.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/entity/RedactionPosition.java @@ -1,9 +1,9 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.entity; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.entity; import java.awt.geom.Rectangle2D; import java.util.List; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Document.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Document.java similarity index 85% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Document.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Document.java index d286c65..e3cc3e2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Document.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Document.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.awt.geom.Rectangle2D; import java.util.Collections; @@ -12,10 +12,10 @@ import java.util.stream.Stream; import com.amazonaws.services.kms.model.NotFoundException; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Footer.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Footer.java similarity index 76% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Footer.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Footer.java index a8bef65..ee21d4e 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Footer.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Footer.java @@ -1,13 +1,13 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/GenericSemanticNode.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/GenericSemanticNode.java new file mode 100644 index 0000000..08a4714 --- /dev/null +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/GenericSemanticNode.java @@ -0,0 +1,5 @@ +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; + +public interface GenericSemanticNode extends SemanticNode { + +} diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Header.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Header.java similarity index 76% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Header.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Header.java index b405395..1a06a18 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Header.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Header.java @@ -1,13 +1,13 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Headline.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Headline.java similarity index 77% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Headline.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Headline.java index 4856683..c7d8a4f 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Headline.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Headline.java @@ -1,13 +1,13 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Image.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Image.java similarity index 80% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Image.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Image.java index 058f322..1a9c42d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Image.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Image.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.awt.geom.Rectangle2D; import java.util.Collections; @@ -9,10 +9,10 @@ import java.util.Map; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/ImageType.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/ImageType.java similarity index 85% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/ImageType.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/ImageType.java index b0f9e59..e863c1a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/ImageType.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/ImageType.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.Locale; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Page.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Page.java similarity index 83% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Page.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Page.java index 5fcfa51..3e98ab3 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Page.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Page.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.LinkedList; @@ -6,9 +6,9 @@ import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Paragraph.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Paragraph.java similarity index 75% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Paragraph.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Paragraph.java index 2f471fa..f092253 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Paragraph.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Paragraph.java @@ -1,13 +1,13 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Section.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Section.java similarity index 78% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Section.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Section.java index 2a3f360..51655a2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Section.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Section.java @@ -1,14 +1,14 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.util.HashSet; import java.util.List; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/SemanticNode.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/SemanticNode.java similarity index 95% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/SemanticNode.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/SemanticNode.java index 68c6202..8799b44 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/SemanticNode.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/SemanticNode.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import static java.lang.String.format; @@ -13,12 +13,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.EntityType; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.EntityType; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations; public interface SemanticNode { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Table.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java similarity index 96% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Table.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java index dab94ed..bd33f6d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Table.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/Table.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import static java.lang.String.format; @@ -11,10 +11,10 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/TableCell.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/TableCell.java similarity index 80% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/TableCell.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/TableCell.java index 74a34e7..b5a0b85 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/TableCell.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/nodes/TableCell.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.nodes; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes; import java.awt.geom.Rectangle2D; import java.util.HashMap; @@ -8,10 +8,10 @@ import java.util.Map; import java.util.Set; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.entity.RedactionEntity; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.entity.RedactionEntity; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/AtomicTextBlock.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/AtomicTextBlock.java similarity index 96% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/AtomicTextBlock.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/AtomicTextBlock.java index 85719de..33d9427 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/AtomicTextBlock.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/AtomicTextBlock.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.textblock; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock; import static java.lang.String.format; @@ -13,9 +13,9 @@ import java.util.Map; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations; import lombok.AccessLevel; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/ConcatenatedTextBlock.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/ConcatenatedTextBlock.java similarity index 96% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/ConcatenatedTextBlock.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/ConcatenatedTextBlock.java index 4e1a5fb..10ce939 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/ConcatenatedTextBlock.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/ConcatenatedTextBlock.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.textblock; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock; import static java.lang.String.format; @@ -11,8 +11,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; import lombok.AccessLevel; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlock.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlock.java similarity index 92% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlock.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlock.java index 69d1640..df9c427 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlock.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlock.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.textblock; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock; import static java.lang.String.format; @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; public interface TextBlock extends CharSequence { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlockCollector.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlockCollector.java similarity index 92% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlockCollector.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlockCollector.java index 7e066c4..eccb589 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/textblock/TextBlockCollector.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/graph/textblock/TextBlockCollector.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.graph.textblock; +package com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock; import java.util.Set; import java.util.function.BiConsumer; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/image/ClassifiedImage.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/image/ClassifiedImage.java index b0da3b9..56c36a2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/image/ClassifiedImage.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/image/ClassifiedImage.java @@ -2,7 +2,7 @@ package com.knecon.fforesight.service.layoutparser.processor.model.image; import java.awt.geom.Rectangle2D; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.ImageType; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType; import lombok.Data; import lombok.NonNull; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/CvTableParsingAdapter.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/CvTableParsingAdapter.java similarity index 82% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/CvTableParsingAdapter.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/CvTableParsingAdapter.java index 0fd3131..4e58f1d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/CvTableParsingAdapter.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/CvTableParsingAdapter.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter; +package com.knecon.fforesight.service.layoutparser.processor.python_api.adapter; import java.util.ArrayList; import java.util.Collection; @@ -8,8 +8,8 @@ import java.util.Map; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableCells; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableCells; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/ImageServiceResponseAdapter.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/ImageServiceResponseAdapter.java similarity index 91% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/ImageServiceResponseAdapter.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/ImageServiceResponseAdapter.java index 4b64f1c..55c345c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/ImageServiceResponseAdapter.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/adapter/ImageServiceResponseAdapter.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter; +package com.knecon.fforesight.service.layoutparser.processor.python_api.adapter; import java.awt.geom.Rectangle2D; import java.util.ArrayList; @@ -9,10 +9,10 @@ import java.util.Map; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.ImageType; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType; import lombok.RequiredArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Classification.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java similarity index 70% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Classification.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java index f482f81..923a447 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Classification.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import java.util.HashMap; import java.util.Map; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/FilterGeometry.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/FilterGeometry.java similarity index 60% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/FilterGeometry.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/FilterGeometry.java index 3f3c75b..3d9ef06 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/FilterGeometry.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/FilterGeometry.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Filters.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Filters.java similarity index 65% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Filters.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Filters.java index cf3a755..c7e20ec 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Filters.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Filters.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Geometry.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Geometry.java similarity index 55% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Geometry.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Geometry.java index 7380c48..8f0bf55 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Geometry.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Geometry.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageFormat.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageFormat.java similarity index 63% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageFormat.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageFormat.java index 842f1b7..2c5d39c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageFormat.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageFormat.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageMetadata.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageMetadata.java similarity index 72% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageMetadata.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageMetadata.java index ab37c0e..2eec846 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageMetadata.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageMetadata.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageServiceResponse.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java similarity index 87% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageServiceResponse.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java index bad3701..273dc35 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageServiceResponse.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import java.util.ArrayList; import java.util.List; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageSize.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageSize.java similarity index 63% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageSize.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageSize.java index 871e942..42b5da3 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageSize.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageSize.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Position.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Position.java similarity index 66% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Position.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Position.java index 595d9ce..d3f694d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Position.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Position.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Probability.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Probability.java similarity index 51% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Probability.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Probability.java index 7762e7d..ce4940c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Probability.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Probability.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.image; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PageInfo.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PageInfo.java similarity index 64% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PageInfo.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PageInfo.java index b098cb3..d132029 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PageInfo.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PageInfo.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PdfTableCell.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PdfTableCell.java similarity index 80% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PdfTableCell.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PdfTableCell.java index 808a572..800a25d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PdfTableCell.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/PdfTableCell.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableCells.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableCells.java similarity index 72% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableCells.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableCells.java index 8410179..45c46f1 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableCells.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableCells.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table; import lombok.Builder; import lombok.Data; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableData.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java similarity index 70% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableData.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java index f82911f..af52a5a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableData.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table; import java.util.ArrayList; import java.util.List; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableServiceResponse.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java similarity index 80% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableServiceResponse.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java index 8d5e506..dc7e28e 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableServiceResponse.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table; +package com.knecon.fforesight.service.layoutparser.processor.python_api.model.table; import java.util.ArrayList; import java.util.List; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/PdfParsingService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/PdfParsingService.java index aa00c21..1f71d6d 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/PdfParsingService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/PdfParsingService.java @@ -10,8 +10,8 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.springframework.stereotype.Service; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; -import com.knecon.fforesight.service.layoutparser.processor.adapter.ImageServiceResponseAdapter; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableCells; +import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableCells; import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; @@ -19,7 +19,7 @@ import com.knecon.fforesight.service.layoutparser.processor.model.image.Classifi import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.parsing.PDFLinesTextStripper; +import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDFLinesTextStripper; import com.knecon.fforesight.service.layoutparser.processor.services.blockification.DocuMineBlockificationService; import com.knecon.fforesight.service.layoutparser.processor.services.blockification.RedactManagerBlockificationService; import com.knecon.fforesight.service.layoutparser.processor.services.blockification.TaasBlockificationService; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java index e949c52..f18cfee 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/RulingCleaningService.java @@ -12,7 +12,7 @@ import java.util.Map; import org.springframework.stereotype.Service; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableCells; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableCells; import com.knecon.fforesight.service.layoutparser.processor.model.table.CleanRulings; import com.knecon.fforesight.service.layoutparser.processor.model.table.Ruling; import com.knecon.fforesight.service.layoutparser.processor.utils.DoubleComparisons; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/SectionGridCreatorService.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/SectionGridCreatorService.java index 5a4a40f..f159583 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/SectionGridCreatorService.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/SectionGridCreatorService.java @@ -20,11 +20,11 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlo import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionRectangle; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; import lombok.RequiredArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/TextPositionSequenceSorter.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/TextPositionSequenceSorter.java index 7b09e78..5b78fd9 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/TextPositionSequenceSorter.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/TextPositionSequenceSorter.java @@ -15,7 +15,7 @@ import org.springframework.core.io.ClassPathResource; import com.knecon.fforesight.service.layoutparser.processor.model.PageContents; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.parsing.PDFLinesTextStripper; +import com.knecon.fforesight.service.layoutparser.processor.services.parsing.PDFLinesTextStripper; import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/DocumentGraphFactory.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/DocumentGraphFactory.java similarity index 89% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/DocumentGraphFactory.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/DocumentGraphFactory.java index 8e56f49..83b2381 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/DocumentGraphFactory.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/DocumentGraphFactory.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import static java.lang.String.format; import static java.util.stream.Collectors.groupingBy; @@ -20,17 +20,17 @@ import com.knecon.fforesight.service.layoutparser.processor.model.Classification import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationPage; import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Footer; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.GenericSemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Header; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Headline; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Image; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Paragraph; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Section; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Footer; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Header; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Headline; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Paragraph; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; import com.knecon.fforesight.service.layoutparser.processor.utils.IdBuilder; import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionDto.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionDto.java similarity index 84% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionDto.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionDto.java index 231148e..96118cd 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionDto.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionDto.java @@ -1,10 +1,10 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import java.awt.geom.Rectangle2D; import java.util.Collections; import java.util.List; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; import lombok.AccessLevel; import lombok.Builder; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionFactory.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionFactory.java similarity index 98% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionFactory.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionFactory.java index 6a018ed..e14b55e 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionFactory.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SearchTextWithTextPositionFactory.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; @@ -11,7 +11,7 @@ import java.util.Objects; import com.knecon.fforesight.service.layoutparser.processor.model.text.RedTextPosition; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextDirection; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SectionNodeFactory.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SectionNodeFactory.java similarity index 95% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SectionNodeFactory.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SectionNodeFactory.java index 01eea15..7bd82e2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SectionNodeFactory.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/SectionNodeFactory.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import static java.lang.String.format; import static java.util.Collections.emptyList; @@ -14,9 +14,9 @@ import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBl import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage; import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPageBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.GenericSemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Section; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section; import com.knecon.fforesight.service.layoutparser.processor.utils.TableMergingUtility; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TableNodeFactory.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TableNodeFactory.java similarity index 90% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TableNodeFactory.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TableNodeFactory.java index 13977a1..83cf13a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TableNodeFactory.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TableNodeFactory.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import static java.util.Collections.emptyList; @@ -11,12 +11,12 @@ import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBl import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell; import com.knecon.fforesight.service.layoutparser.processor.model.table.TablePageBlock; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.GenericSemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.GenericSemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TextBlockFactory.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TextBlockFactory.java similarity index 88% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TextBlockFactory.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TextBlockFactory.java index 399c9d5..6a0268c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TextBlockFactory.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/factory/TextBlockFactory.java @@ -1,11 +1,11 @@ -package com.knecon.fforesight.service.layoutparser.processor.factory; +package com.knecon.fforesight.service.layoutparser.processor.services.factory; import java.util.List; import com.knecon.fforesight.service.layoutparser.processor.model.text.TextPositionSequence; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; import lombok.AccessLevel; import lombok.experimental.FieldDefaults; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentDataMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentDataMapper.java similarity index 87% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentDataMapper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentDataMapper.java index c9559ee..4807e3a 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentDataMapper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentDataMapper.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.mapper.redaction; +package com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction; import java.awt.geom.Rectangle2D; import java.util.HashMap; @@ -12,14 +12,14 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.Do import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Image; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentGraphMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentGraphMapper.java similarity index 83% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentGraphMapper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentGraphMapper.java index b2b3472..5f92629 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/DocumentGraphMapper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/DocumentGraphMapper.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.mapper.redaction; +package com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction; import java.util.Arrays; import java.util.HashSet; @@ -12,21 +12,21 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.Do import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Footer; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Header; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Headline; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Image; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Paragraph; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Section; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlockCollector; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Footer; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Header; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Headline; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Paragraph; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlockCollector; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/PropertiesMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/PropertiesMapper.java similarity index 90% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/PropertiesMapper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/PropertiesMapper.java index fdff5c1..237440b 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/redaction/PropertiesMapper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/redaction/PropertiesMapper.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.mapper.redaction; +package com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction; import java.awt.geom.Rectangle2D; import java.util.Arrays; @@ -6,10 +6,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Image; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.ImageType; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Image; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations; public class PropertiesMapper { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/taas/TaasDocumentDataMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/taas/TaasDocumentDataMapper.java similarity index 88% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/taas/TaasDocumentDataMapper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/taas/TaasDocumentDataMapper.java index de18ba2..2d924f8 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/mapper/taas/TaasDocumentDataMapper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/taas/TaasDocumentDataMapper.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.mapper.taas; +package com.knecon.fforesight.service.layoutparser.processor.services.mapper.taas; import java.awt.geom.Rectangle2D; import java.util.List; @@ -13,13 +13,13 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.Researc import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.RowData; import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.StructureObject; import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.TableData; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.TableCell; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; public class TaasDocumentDataMapper { diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/LegacyPDFStreamEngine.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/LegacyPDFStreamEngine.java similarity index 99% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/LegacyPDFStreamEngine.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/LegacyPDFStreamEngine.java index f2ece49..8d7b4f2 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/LegacyPDFStreamEngine.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/LegacyPDFStreamEngine.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.knecon.fforesight.service.layoutparser.processor.parsing; +package com.knecon.fforesight.service.layoutparser.processor.services.parsing; import java.io.IOException; import java.io.InputStream; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFLinesTextStripper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFLinesTextStripper.java similarity index 99% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFLinesTextStripper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFLinesTextStripper.java index 549f726..cd4ff06 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFLinesTextStripper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFLinesTextStripper.java @@ -1,4 +1,4 @@ -package com.knecon.fforesight.service.layoutparser.processor.parsing; +package com.knecon.fforesight.service.layoutparser.processor.services.parsing; import java.awt.color.CMMException; import java.awt.geom.Point2D; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFTextStripper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFTextStripper.java similarity index 99% rename from layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFTextStripper.java rename to layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFTextStripper.java index b7fe3e3..237dc0c 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/parsing/PDFTextStripper.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/parsing/PDFTextStripper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.knecon.fforesight.service.layoutparser.processor.parsing; +package com.knecon.fforesight.service.layoutparser.processor.services.parsing; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/IdBuilder.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/IdBuilder.java index 8c05bb7..9b06c63 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/IdBuilder.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/IdBuilder.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; import lombok.experimental.UtilityClass; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/PdfVisualisationUtility.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/PdfVisualisationUtility.java index 0e82c1d..ccd76fc 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/PdfVisualisationUtility.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/PdfVisualisationUtility.java @@ -15,11 +15,11 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import lombok.AccessLevel; import lombok.Builder; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangleTransformations.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangleTransformations.java index 2a7b4eb..1a49607 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangleTransformations.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/utils/RectangleTransformations.java @@ -18,7 +18,7 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point; import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; 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 b734be0..e71c32a 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 @@ -22,11 +22,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.ResearchDocumentData; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; -import com.knecon.fforesight.service.layoutparser.processor.mapper.taas.TaasDocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.taas.TaasDocumentDataMapper; import com.knecon.fforesight.service.layoutparser.server.utils.BaseTest; import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw; 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 2d9ffb2..e4ae1f2 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 @@ -30,10 +30,10 @@ import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.service.StorageService; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.SemanticNode; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode; import com.knecon.fforesight.tenantcommons.TenantsClient; import lombok.AllArgsConstructor; diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BoundaryTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BoundaryTest.java index 504d3f2..4c704f7 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BoundaryTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BoundaryTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary; class BoundaryTest { diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BuildDocumentGraphTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BuildDocumentGraphTest.java index f0de14e..8525f0c 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BuildDocumentGraphTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/BuildDocumentGraphTest.java @@ -13,8 +13,8 @@ import org.springframework.core.io.ClassPathResource; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; import com.knecon.fforesight.service.layoutparser.server.utils.BaseTest; import lombok.SneakyThrows; diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentDataTests.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentDataTests.java index 179dcfc..5eb54f2 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentDataTests.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentDataTests.java @@ -11,7 +11,7 @@ import org.springframework.core.io.ClassPathResource; import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.DocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.DocumentDataMapper; import lombok.SneakyThrows; 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 efd8690..83b3ef2 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 @@ -15,10 +15,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentData; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.DocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.DocumentDataMapper; import lombok.SneakyThrows; diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphMappingTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphMappingTest.java index a8d0ac5..75ffb5d 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphMappingTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphMappingTest.java @@ -11,11 +11,11 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.Do import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Table; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.DocumentDataMapper; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.DocumentGraphMapper; -import com.knecon.fforesight.service.layoutparser.processor.mapper.redaction.PropertiesMapper; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.DocumentDataMapper; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.DocumentGraphMapper; +import com.knecon.fforesight.service.layoutparser.processor.services.mapper.redaction.PropertiesMapper; import com.knecon.fforesight.tenantcommons.TenantContext; import lombok.SneakyThrows; diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphVisualizationTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphVisualizationTest.java index e6f0600..a02a95b 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphVisualizationTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/DocumentGraphVisualizationTest.java @@ -10,8 +10,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import com.knecon.fforesight.service.layoutparser.server.utils.visualizations.PdfDraw; import lombok.SneakyThrows; 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 aa981b2..3774033 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 @@ -21,11 +21,11 @@ import org.springframework.core.io.ClassPathResource; import com.fasterxml.jackson.databind.ObjectMapper; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; -import com.knecon.fforesight.service.layoutparser.processor.adapter.CvTableParsingAdapter; -import com.knecon.fforesight.service.layoutparser.processor.adapter.ImageServiceResponseAdapter; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.ImageType; +import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.CvTableParsingAdapter; +import com.knecon.fforesight.service.layoutparser.processor.python_api.adapter.ImageServiceResponseAdapter; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.image.ImageServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.python_api.model.table.TableServiceResponse; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.ImageType; import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationDocument; import com.knecon.fforesight.service.layoutparser.processor.model.image.ClassifiedImage; import com.knecon.fforesight.service.layoutparser.processor.model.table.Cell; diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/visualizations/PdfDraw.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/visualizations/PdfDraw.java index 9fbfa3e..6158031 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/visualizations/PdfDraw.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/visualizations/PdfDraw.java @@ -19,11 +19,11 @@ import org.apache.pdfbox.util.Matrix; import org.springframework.core.io.ClassPathResource; import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.NodeType; -import com.knecon.fforesight.service.layoutparser.processor.graph.DocumentTree; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Document; -import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.AtomicTextBlock; -import com.knecon.fforesight.service.layoutparser.processor.graph.textblock.TextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.DocumentTree; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.AtomicTextBlock; +import com.knecon.fforesight.service.layoutparser.processor.model.graph.textblock.TextBlock; import com.knecon.fforesight.service.layoutparser.processor.utils.PdfVisualisationUtility; import com.knecon.fforesight.service.layoutparser.processor.utils.RectangleTransformations;