try native build

Fix gradle deploy

See merge request fforesight/layout-parser!3

.gitignore

@@ -18,6 +18,7 @@ target/
 .settings
 .springBeans
 .sts4-cache
+.gradle
 
 ### IntelliJ IDEA ###
 .idea

.gitlab-ci.yml

@@ -1,6 +1,4 @@
-variables:
-  SONAR_PROJECT_KEY: 'fforesight_layout-parser_AYd5quv2mRkBOCG22hvF'
 include:
   - project: 'gitlab/gitlab'
     ref: 'main'
-    file: 'ci-templates/maven_java.yml'
+    file: 'ci-templates/gradle_java.yml'

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}

buildSrc/src/main/kotlin/com.knecon.fforesight.java-conventions.gradle.kts

@@ -0,0 +1,56 @@
+plugins {
+    java
+    pmd
+    checkstyle
+    jacoco
+}
+
+group = "com.knecon.fforesight"
+version = "0.1-SNAPSHOT"
+
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
+
+tasks.jacocoTestReport {
+    reports {
+        xml.required.set(false)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+    }
+}
+
+tasks.pmdMain {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/test_pmd.xml")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+    }
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/gindev/");
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull();
+            password = providers.gradleProperty("mavenPassword").getOrNull();
+        }
+    }
+}

config/checkstyle/checkstyle.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property
+            name="severity"
+            value="error"/>
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+        <module name="AnnotationLocation"/>
+        <module name="JavadocStyle"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="EmptyBlock"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExplicitInitialization"/>
+        <module name="IllegalInstantiation"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="PackageDeclaration"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="OneStatementPerLine"/>
+        <module name="FinalClass"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+        <module name="OuterTypeFilename"/>
+    </module>
+    <module name="FileTabCharacter"/>
+    <module name="SuppressWarningsFilter"/>
+</module>

config/pmd/pmd.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon ruleset checks the code for bad stuff
+    </description>
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+    </rule>
+
+</ruleset>

config/pmd/test_pmd.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon test ruleset checks the code for bad stuff
+    </description>
+
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AvoidFieldNameMatchingTypeName"/>
+    </rule>
+
+</ruleset>

gradle.properties.kts

@@ -0,0 +1 @@
+version = 0.1.0

layoutparser-service-image/pom.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-
-
-    <parent>
-        <groupId>com.iqser.red</groupId>
-        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>com.knecon.fforesight</groupId>
-    <artifactId>layoutparser-service-image</artifactId>
-    <version>1.0.0</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <service.server>layoutparser-service-server</service.server>
-        <platform.jar>${service.server}.jar</platform.jar>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.image.name>${docker.image.prefix}/${service.server}</docker.image.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>download-platform-jar</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <dependency>
-                                        <groupId>${project.groupId}</groupId>
-                                        <artifactId>${service.server}</artifactId>
-                                        <version>${project.version}</version>
-                                        <type>jar</type>
-                                        <overWrite>true</overWrite>
-                                        <destFileName>${platform.jar}</destFileName>
-                                    </dependency>
-                                </artifactItems>
-                                <outputDirectory>${docker.build.directory}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <images>
-                            <image>
-                                <name>${docker.image.name}</name>
-                                <build>
-                                    <dockerFileDir>${docker.build.directory}</dockerFileDir>
-                                    <args>
-                                        <PLATFORM_JAR>${platform.jar}</PLATFORM_JAR>
-                                    </args>
-                                    <tags>
-                                        <tag>${docker.image.version}</tag>
-                                        <tag>latest</tag>
-                                    </tags>
-                                </build>
-                            </image>
-                        </images>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>

layoutparser-service-image/src/main/docker/Dockerfile

@@ -1,9 +0,0 @@
-FROM red/base-image:2.0.2
-
-ARG PLATFORM_JAR
-
-ENV PLATFORM_JAR ${PLATFORM_JAR}
-
-ENV USES_ELASTICSEARCH false
-
-COPY ["${PLATFORM_JAR}", "/"]

layoutparser-service/layoutparser-service-internal-api/build.gradle.kts

@@ -0,0 +1,6 @@
+plugins {
+    id("com.knecon.fforesight.java-conventions")
+    id("io.freefair.lombok") version "8.1.0"
+}
+
+description = "layoutparser-service-internal-api"

layoutparser-service/layoutparser-service-internal-api/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.knecon.fforesight</groupId>
-        <artifactId>layoutparser-service</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>layoutparser-service-internal-api</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
-        </dependency>
-    </dependencies>
-
-</project>

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentData.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -12,9 +12,9 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 public class DocumentData {
 
-    PageData[] pages;
-    AtomicTextBlockData[] atomicTextBlocks;
-    AtomicPositionBlockData[] atomicPositionBlocks;
-    TableOfContentsData tableOfContents;
+    DocumentPage[] documentPages;
+    DocumentTextData[] documentTextData;
+    DocumentPositionData[] documentPositions;
+    DocumentStructure documentStructure;
 
 }

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentPage.java

@@ -1,16 +1,18 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
 @Data
 @Builder
+@NoArgsConstructor
 @AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class PageData {
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DocumentPage {
 
     int number;
     int height;

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentPositionData.java

@@ -1,16 +1,18 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
 @Data
 @Builder
+@NoArgsConstructor
 @AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class AtomicPositionBlockData {
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DocumentPositionData {
 
     Long id;
     int[] stringIdxToPositionIdx;

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentStructure.java

@@ -1,25 +1,22 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType;
-
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
 @Data
 @Builder
-@AllArgsConstructor
 @NoArgsConstructor
+@AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableOfContentsData {
+public class DocumentStructure {
 
     EntryData root;
 
@@ -29,9 +26,9 @@ public class TableOfContentsData {
         if (tocId.isEmpty()) {
             return root;
         }
-        EntryData entry = root.subEntries.get(tocId.get(0));
+        EntryData entry = root.children.get(tocId.get(0));
         for (int id : tocId.subList(1, tocId.size())) {
-            entry = entry.subEntries.get(id);
+            entry = entry.children.get(id);
         }
         return entry;
     }
@@ -39,7 +36,7 @@ public class TableOfContentsData {
 
     public Stream<EntryData> streamAllEntries() {
 
-        return Stream.concat(Stream.of(root), root.subEntries.stream()).flatMap(TableOfContentsData::flatten);
+        return Stream.concat(Stream.of(root), root.children.stream()).flatMap(DocumentStructure::flatten);
     }
 
 
@@ -51,30 +48,30 @@ public class TableOfContentsData {
 
     private static Stream<EntryData> flatten(EntryData entry) {
 
-        return Stream.concat(Stream.of(entry), entry.subEntries.stream().flatMap(TableOfContentsData::flatten));
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(DocumentStructure::flatten));
     }
 
 
+    @Data
     @Builder
-    @Getter
+    @NoArgsConstructor
     @AllArgsConstructor
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    @FieldDefaults(level = AccessLevel.PRIVATE)
     public static class EntryData {
 
         NodeType type;
-        int[] tocId;
-        Long[] atomicBlocks;
-        Long[] pages;
+        int[] treeId;
+        Long[] atomicBlockIds;
+        Long[] pageNumbers;
         Map<String, String> properties;
-        List<EntryData> subEntries;
-
+        List<EntryData> children;
 
         @Override
         public String toString() {
 
             StringBuilder sb = new StringBuilder();
             sb.append("[");
-            for (int i : tocId) {
+            for (int i : treeId) {
                 sb.append(i);
                 sb.append(",");
             }
@@ -83,7 +80,7 @@ public class TableOfContentsData {
 
             sb.append(type);
             sb.append(" atbs = ");
-            sb.append(atomicBlocks.length);
+            sb.append(atomicBlockIds.length);
 
             return sb.toString();
         }

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/DocumentTextData.java

@@ -1,16 +1,20 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.data;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
+
+
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
 
 @Data
 @Builder
+@NoArgsConstructor
 @AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class AtomicTextBlockData {
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DocumentTextData {
 
     Long id;
     Long page;

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/redaction/NodeType.java

@@ -1,4 +1,6 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
+package com.knecon.fforesight.service.layoutparser.internal.api.data.redaction;
+
+import java.util.Locale;
 
 public enum NodeType {
     DOCUMENT,
@@ -9,5 +11,11 @@ public enum NodeType {
     TABLE_CELL,
     IMAGE,
     HEADER,
-    FOOTER
+    FOOTER;
+
+
+    public String toString() {
+
+        return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ROOT);
+    }
 }

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/ParagraphData.java

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+import java.util.List;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ParagraphData {
+
+    private String text;
+    List<Range> boldTextBoundaries;
+    List<Range> italicTextBoundaries;
+    List<Integer> linebreaks;
+    private String classification;
+
+    private String orientation;
+    private int textDirection;
+
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/Range.java

@@ -0,0 +1,5 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+public record Range(int start, int end) {
+
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/ResearchDocumentData.java

@@ -0,0 +1,16 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+@AllArgsConstructor
+public class ResearchDocumentData {
+
+    String originalFile;
+    List<StructureObject> structureObjects;
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/RowData.java

@@ -0,0 +1,15 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class RowData {
+
+    boolean header;
+    List<ParagraphData> cellText;
+    float[] bBox;
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/StructureObject.java

@@ -0,0 +1,19 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@AllArgsConstructor
+public class StructureObject {
+
+    Integer structureObjectNumber;
+    int page;
+    int stringOffset;
+    float[] boundingBox;
+    ParagraphData paragraph;
+    TableData table;
+
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/data/taas/TableData.java

@@ -0,0 +1,16 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.data.taas;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class TableData {
+
+    List<RowData> rowData;
+    Integer numberOfCols;
+    Integer numberOfRows;
+
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/DocumentGraph.java

@@ -1,101 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SectionNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class DocumentGraph implements SemanticNode {
-
-    Set<PageNode> pages;
-    TableOfContents tableOfContents;
-    Integer numberOfPages;
-    TextBlock textBlock;
-
-
-    public TextBlock buildTextBlock() {
-
-        return streamTerminalTextBlocksInOrder().collect(new TextBlockCollector());
-    }
-
-
-    public List<SectionNode> getMainSections() {
-
-        return streamChildren().filter(node -> node instanceof SectionNode).map(node -> (SectionNode) node).collect(Collectors.toList());
-    }
-
-
-    public Stream<TextBlock> streamTerminalTextBlocksInOrder() {
-
-        return streamAllNodes().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock);
-    }
-
-
-    public Set<EntityNode> getEntities() {
-
-        return streamAllSubNodes().map(SemanticNode::getEntities).flatMap(Set::stream).collect(Collectors.toUnmodifiableSet());
-    }
-
-
-    @Override
-    public List<Integer> getTocId() {
-
-        return Collections.emptyList();
-    }
-
-
-    @Override
-    public void setTocId(List<Integer> tocId) {
-
-        throw new UnsupportedOperationException("DocumentGraph is always the root of the Table of Contents");
-    }
-
-
-    private Stream<SemanticNode> streamAllNodes() {
-
-        return tableOfContents.streamAllEntriesInOrder().map(TableOfContents.Entry::getNode);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return NodeType.DOCUMENT + ": " + buildTextBlock().buildSummary();
-    }
-
-
-    @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
-
-        Map<PageNode, Rectangle2D> bBox = new HashMap<>();
-        for (PageNode page : pages) {
-            bBox.put(page, new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()));
-        }
-        return bBox;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/TableOfContents.java

@@ -1,193 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph;
-
-import static java.lang.String.format;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.google.common.hash.Hashing;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Data
-public class TableOfContents {
-
-    private final Entry root;
-
-
-    public TableOfContents(DocumentGraph documentGraph) {
-
-        root = Entry.builder().tocId(Collections.emptyList()).type(NodeType.DOCUMENT).children(new LinkedList<>()).node(documentGraph).build();
-    }
-
-
-    public TextBlock buildTextBlock() {
-
-        return streamAllEntriesInOrder().map(Entry::getNode).filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-    }
-
-
-    public List<Integer> createNewMainEntryAndReturnId(NodeType nodeType, SemanticNode node) {
-
-        return createNewChildEntryAndReturnId(Collections.emptyList(), nodeType, node);
-    }
-
-
-    public List<Integer> createNewChildEntryAndReturnId(List<Integer> parentId, NodeType nodeType, SemanticNode node) {
-
-        if (!entryExists(parentId)) {
-            throw new UnsupportedOperationException(format("parentId %s does not exist!", parentId));
-        }
-
-        Entry parent = getEntryById(parentId);
-        List<Integer> newId = new LinkedList<>(parentId);
-        newId.add(parent.children.size());
-        parent.children.add(Entry.builder().tocId(newId).node(node).type(nodeType).children(new LinkedList<>()).build());
-
-        return newId;
-    }
-
-
-    private boolean entryExists(List<Integer> tocId) {
-
-        if (tocId.isEmpty()) {
-            return root != null;
-        }
-        Entry entry = root.children.get(tocId.get(0));
-        for (int id : tocId.subList(1, tocId.size())) {
-            if (id >= entry.children.size() || 0 > id) {
-                return false;
-            }
-            entry = entry.children.get(id);
-        }
-        return true;
-    }
-
-
-    public Entry getParentEntryById(List<Integer> tocId) {
-
-        return getEntryById(getParentId(tocId));
-    }
-
-
-    public boolean hasParentById(List<Integer> tocId) {
-
-        return entryExists(getParentId(tocId));
-    }
-
-
-    public Stream<SemanticNode> streamChildrenNodes(List<Integer> tocId) {
-
-        return getEntryById(tocId).children.stream().map(Entry::getNode);
-    }
-
-
-    private static List<Integer> getParentId(List<Integer> tocId) {
-
-        if (tocId.isEmpty()) {
-            throw new UnsupportedOperationException("Root has no parent!");
-        }
-        if (tocId.size() < 2) {
-            return Collections.emptyList();
-        }
-        return tocId.subList(0, tocId.size() - 1);
-    }
-
-
-    public Entry getEntryById(List<Integer> tocId) {
-
-        if (tocId.isEmpty()) {
-            return root;
-        }
-        Entry entry = root.children.get(tocId.get(0));
-        for (int id : tocId.subList(1, tocId.size())) {
-            entry = entry.children.get(id);
-        }
-        return entry;
-    }
-
-
-    public Stream<Entry> streamMainEntries() {
-
-        return root.children.stream();
-    }
-
-
-    public Stream<Entry> streamAllEntriesInOrder() {
-
-        return Stream.of(root).flatMap(TableOfContents::flatten);
-    }
-
-
-    public Stream<Entry> streamAllSubEntriesInOrder(List<Integer> parentId) {
-
-        return getEntryById(parentId).getChildren().stream().flatMap(TableOfContents::flatten);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return String.join("\n", streamAllEntriesInOrder().map(Entry::toString).toList());
-    }
-
-
-    public String toString(List<Integer> id) {
-
-        return String.join("\n", streamAllSubEntriesInOrder(id).map(Entry::toString).toList());
-    }
-
-
-    private static Stream<Entry> flatten(Entry entry) {
-
-        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(TableOfContents::flatten));
-    }
-
-
-    @Builder
-    @Getter
-    @AllArgsConstructor
-    @FieldDefaults(level = AccessLevel.PRIVATE,  makeFinal = true)
-    public static class Entry {
-
-        List<Integer> tocId;
-        NodeType type;
-        SemanticNode node;
-        List<Entry> children;
-
-
-        @Override
-        public String toString() {
-
-            return node.toString();
-        }
-
-
-        @Override
-        public int hashCode() {
-
-            return Hashing.murmur3_32_fixed().hashString(toString(), StandardCharsets.UTF_8).hashCode();
-        }
-
-
-        @Override
-        public boolean equals(Object o) {
-
-            return o instanceof Entry && o.hashCode() == this.hashCode();
-        }
-
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/entity/EntityNode.java

@@ -1,76 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.entity;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.Boundary;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-
-public interface EntityNode {
-
-    /**
-     * This represents the text, which is contained within the boundary of the Entity.
-     *
-     * @return String
-     */
-    String getValue();
-
-
-    /**
-     * The Boundary primarily defines the Entity, all other values may be inferred from it.
-     *
-     * @return Boundary, uniquely identifying this Entity
-     */
-    Boundary getBoundary();
-
-
-    /**
-     * The deepest fully containing node represents the node which is the deepest node in the document tree structure,
-     * whose boundary also fully contains the boundary of this entity.
-     *
-     * @return the deepest fully containing node
-     */
-    SemanticNode getDeepestFullyContainingNode();
-
-
-    /**
-     * The intersecting nodes represent all nodes, whose boundary intersects the boundary of this entity.
-     *
-     * @return all intersecting Nodes
-     */
-    List<SemanticNode> getIntersectingNodes();
-
-
-    void setDeepestFullyContainingNode(SemanticNode semanticNode);
-
-
-    void addIntersectingNode(SemanticNode semanticNode);
-
-
-    void setIntersectingNodes(List<SemanticNode> semanticNodes);
-
-
-    /**
-     * @return all pages this entity intersects.
-     */
-    Set<PageNode> getPages();
-
-
-    void setPages(Set<PageNode> pages);
-
-
-    /**
-     * removes all occurrences of this node in the graph and resets all graph specific fields.
-     */
-    default void removeFromGraph() {
-
-        getIntersectingNodes().forEach(node -> node.getEntities().remove(this));
-        getPages().forEach(page -> page.getEntities().remove(this));
-        setPages(Collections.emptySet());
-        setDeepestFullyContainingNode(null);
-        setIntersectingNodes(Collections.emptyList());
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/entity/EntityPosition.java

@@ -1,45 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.entity;
-
-import java.awt.geom.Rectangle2D;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import com.google.common.hash.Hashing;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class EntityPosition {
-
-    PageNode pageNode;
-    List<Rectangle2D> rectanglePerLine;
-
-
-    public String getId() {
-
-        return String.valueOf(hashCode());
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        StringBuilder sb = new StringBuilder();
-        sb.append(pageNode.getNumber());
-        rectanglePerLine.forEach(r -> sb.append(r.getX()).append(r.getY()).append(r.getWidth()).append(r.getHeight()));
-        return Hashing.murmur3_128().hashString(sb.toString(), StandardCharsets.UTF_8).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-
-        return o instanceof EntityPosition && o.hashCode() == this.hashCode();
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/FooterNode.java

@@ -1,53 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class FooterNode implements SemanticNode {
-
-    List<Integer> tocId;
-    TextBlock terminalTextBlock;
-
-    @Builder.Default
-    boolean terminal = true;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        return terminalTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.FOOTER + ": " + terminalTextBlock.buildSummary();
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/HeaderNode.java

@@ -1,53 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class HeaderNode implements SemanticNode {
-
-    List<Integer> tocId;
-    TextBlock terminalTextBlock;
-
-    @Builder.Default
-    boolean terminal = true;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        return terminalTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.HEADER + ": " + terminalTextBlock.buildSummary();
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/HeadlineNode.java

@@ -1,60 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class HeadlineNode implements SemanticNode {
-
-    List<Integer> tocId;
-    TextBlock terminalTextBlock;
-
-    @Builder.Default
-    boolean terminal = true;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        return terminalTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.HEADLINE + ": " + terminalTextBlock.buildSummary();
-    }
-
-
-    @Override
-    public SemanticNode getHeadline() {
-
-        return this;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/ImageNode.java

@@ -1,87 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ImageNode implements SemanticNode {
-
-    List<Integer> tocId;
-
-    ImageType imageType;
-    boolean transparency;
-    Rectangle2D position;
-
-
-    boolean redaction;
-    boolean ignored;
-
-    @Builder.Default
-    String redactionReason = "";
-    @Builder.Default
-    String legalBasis = "";
-    @Builder.Default
-    int matchedRule = -1;
-
-    @EqualsAndHashCode.Exclude
-    PageNode page;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        return streamAllSubNodes().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public Set<PageNode> getPages() {
-
-        return Collections.singleton(page);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.IMAGE + ": " + imageType.toString() + " " + position;
-    }
-
-
-    @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
-
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
-        bBoxPerPage.put(page, position);
-        return bBoxPerPage;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/ImageType.java

@@ -1,9 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-public enum ImageType {
-    LOGO,
-    FORMULA,
-    SIGNATURE,
-    OTHER,
-    OCR
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/PageNode.java

@@ -1,71 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Setter
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class PageNode {
-
-    Integer number;
-    Integer height;
-    Integer width;
-    Integer rotation;
-
-    @EqualsAndHashCode.Exclude
-    List<SemanticNode> mainBody;
-    @EqualsAndHashCode.Exclude
-    HeaderNode header;
-    @EqualsAndHashCode.Exclude
-    FooterNode footer;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<ImageNode> images = new HashSet<>();
-
-
-    public TextBlock getMainBodyTextBlock() {
-
-        return mainBody.stream().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return String.valueOf(number);
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        return number;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-
-        return o instanceof PageNode && o.hashCode() == this.hashCode();
-    }
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/ParagraphNode.java

@@ -1,51 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ParagraphNode implements SemanticNode {
-
-    List<Integer> tocId;
-    TextBlock terminalTextBlock;
-
-    @Builder.Default
-    boolean terminal = true;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        return terminalTextBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.PARAGRAPH + ": " + terminalTextBlock.buildSummary();
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/SectionNode.java

@@ -1,63 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class SectionNode implements SemanticNode {
-
-    List<Integer> tocId;
-
-    TextBlock textBlock;
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        if (textBlock == null) {
-            textBlock = streamAllSubNodes().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-        }
-        return textBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId.toString() + ": " + NodeType.SECTION + ": " + buildTextBlock().buildSummary();
-    }
-
-
-    public HeadlineNode getHeadline() {
-
-        return streamChildren().filter(node -> node instanceof HeadlineNode)
-                .map(node -> (HeadlineNode) node)
-                .findFirst()
-                .orElseThrow(() -> new NoSuchElementException("ClassificationSection has no Headline!"));
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/SemanticNode.java

@@ -1,275 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.Boundary;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.services.RectangleTransformations;
-
-public interface SemanticNode {
-
-    /**
-     * Searches all Nodes located underneath this Node in the TableOfContents and concatenates their AtomicTextBlocks into a single TextBlockEntity.
-     * So, for a ClassificationSection all TextBlocks of Subsections, Paragraphs, and Tables are concatenated into a single TextBlockEntity
-     * If the Node is Terminal, the TerminalTextBlock will be returned instead.
-     *
-     * @return ClassificationTextBlock containing all AtomicTextBlocks that are located under this Node.
-     */
-    TextBlock buildTextBlock();
-
-
-    /**
-     * Any Node maintains its own Set of Entities.
-     * This Set contains all Entities whose boundary intersects the boundary of this node.
-     *
-     * @return Set of all Entities associated with this Node
-     */
-    Set<EntityNode> getEntities();
-
-
-    /**
-     * Each AtomicTextBlock is assigned a page, so to get the pages this node appears on, it collects the PageNodes from each AtomicTextBlock belonging to this node's ClassificationTextBlock.
-     *
-     * @return Set of PageNodes this node appears on.
-     */
-    default Set<PageNode> getPages() {
-
-        return buildTextBlock().getPages();
-    }
-
-
-    /**
-     * @return the TableOfContents of the ClassificationDocument this node belongs to
-     */
-    TableOfContents getTableOfContents();
-
-
-    /**
-     * The id is a List of Integers uniquely identifying this node in the TableOfContents.
-     *
-     * @return the TableOfContents ID
-     */
-    List<Integer> getTocId();
-
-
-    /**
-     * This should only be used during graph construction.
-     *
-     * @param tocId List of Integers
-     */
-    void setTocId(List<Integer> tocId);
-
-
-    /**
-     * Traverses the Tree up, until it hits a HeadlineNode or hits a SectionNode which will then return the first HeadlineNode from its children.
-     * Throws NotFoundException if no Headline is found this way
-     *
-     * @return First HeadlineNode found
-     */
-    default SemanticNode getHeadline() {
-
-        return getParent().getHeadline();
-    }
-
-
-    /**
-     * @return boolean indicating wether this Node has a Parent in the TableOfContents
-     */
-    default boolean hasParent() {
-
-        return getTableOfContents().hasParentById(getTocId());
-    }
-
-
-    /**
-     * @return The SemanticNode representing the Parent in the TableOfContents
-     * throws NotFoundException, when no parent is present
-     */
-    default SemanticNode getParent() {
-
-        return getTableOfContents().getParentEntryById(getTocId()).getNode();
-    }
-
-
-    /**
-     * Terminal means a SemanticNode has direct access to a ClassificationTextBlock, by default this is false and must be overridden.
-     * Currently only Sections, Images, and Tables are not terminal.
-     * A TableCell might be Terminal depending on its area compared to the page.
-     *
-     * @return boolean, indicating if a Node has direct access to a ClassificationTextBlock
-     */
-    default boolean isTerminal() {
-
-        return false;
-    }
-
-
-    /**
-     * Terminal means a SemanticNode has direct access to a ClassificationTextBlock, by default this is false and must be overridden.
-     * Currently only Sections and Tables are not terminal.
-     *
-     * @return AtomicTextBlock
-     */
-    default TextBlock getTerminalTextBlock() {
-
-        throw new UnsupportedOperationException("Only terminal Nodes have access to TerminalTextBlocks!");
-    }
-
-
-    default void setTerminalTextBlock(TextBlock textBlock) {
-
-        throw new UnsupportedOperationException();
-    }
-
-
-    /**
-     * Each AtomicTextBlock has an index on its page, this returns the number of the first AtomicTextBlock underneath this node.
-     * If this node does not have any AtomicTexBlocks underneath it, e.g. an empty TableCell. It returns -1.
-     *
-     * @return Integer representing the number on the page
-     */
-    default Integer getNumberOnPage() {
-
-        TextBlock textBlock = buildTextBlock();
-        if (textBlock.getAtomicTextBlocks().size() > 0) {
-            return buildTextBlock().getAtomicTextBlocks().get(0).getNumberOnPage();
-        } else {
-            return -1;
-        }
-    }
-
-
-    /**
-     * @return true, if this node's ClassificationTextBlock is not empty
-     */
-    default boolean hasText() {
-
-        return buildTextBlock().length() > 0;
-    }
-
-
-    /**
-     * @param string A String which the ClassificationTextBlock might contain
-     * @return true, if this node's ClassificationTextBlock contains the string
-     */
-    default boolean containsString(String string) {
-
-        return buildTextBlock().getSearchText().contains(string);
-    }
-
-
-    /**
-     * @param strings A List of Strings which the ClassificationTextBlock might contain
-     * @return true, if this node's ClassificationTextBlock contains any of the strings
-     */
-    default boolean containsAnyString(List<String> strings) {
-
-        return strings.stream().anyMatch(this::containsString);
-    }
-
-
-    /**
-     * This function is used during insertion of EntityNodes into the graph, it checks if the boundary of the EntityNode intersects or even contains the EntityNode.
-     * It sets the fields accordingly and recursively calls this function on all its children.
-     *
-     * @param entityNode EntityNode, which is being inserted into the graph
-     */
-    default void addThisToEntityIfIntersects(EntityNode entityNode) {
-
-        TextBlock textBlock = buildTextBlock();
-        if (textBlock.getBoundary().intersects(entityNode.getBoundary())) {
-
-            if (textBlock.containsBoundary(entityNode.getBoundary())) {
-                entityNode.setDeepestFullyContainingNode(this);
-            }
-
-            entityNode.addIntersectingNode(this);
-            streamChildren().forEach(node -> node.addThisToEntityIfIntersects(entityNode));
-        }
-    }
-
-
-    /**
-     * Streams all children located directly underneath this node in the TableOfContents.
-     *
-     * @return Stream of all children
-     */
-    default Stream<SemanticNode> streamChildren() {
-
-        return getTableOfContents().streamChildrenNodes(getTocId());
-    }
-
-
-    /**
-     * recursively streams all SemanticNodes located underneath this node in the TableOfContents in order.
-     *
-     * @return Stream of all SubNodes
-     */
-    default Stream<SemanticNode> streamAllSubNodes() {
-
-        return getTableOfContents().streamAllSubEntriesInOrder(getTocId()).map(TableOfContents.Entry::getNode);
-    }
-
-
-    /**
-     * @return Boundary of this Node's ClassificationTextBlock
-     */
-    default Boundary getBoundary() {
-
-        return buildTextBlock().getBoundary();
-    }
-
-
-    /**
-     * If this Node is Terminal it will calculate the boundingBox of its TerminalTextBlock, otherwise it will calculate the Union of the BoundingBoxes of all its Children.
-     * If called on the ClassificationDocument, it will return the cropbox of each page
-     *
-     * @return Rectangle2D fully encapsulating this Node for each page.
-     */
-    default Map<PageNode, Rectangle2D> getBBox() {
-
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
-        if (isTerminal()) {
-            return getBBoxFromTerminalTextBlock(bBoxPerPage);
-        }
-
-        return getBBoxFromChildren(bBoxPerPage);
-    }
-
-
-    /**
-     * TODO this does not yet work for sections spanning multiple columns.
-     *
-     * @param bBoxPerPage initial empty BoundingBox
-     * @return The union of the BoundingBoxes of all children
-     */
-    private Map<PageNode, Rectangle2D> getBBoxFromChildren(Map<PageNode, Rectangle2D> bBoxPerPage) {
-
-        return streamChildren().map(SemanticNode::getBBox).reduce((map1, map2) -> {
-            map1.forEach((page, rectangle) -> map2.merge(page, rectangle, (rect1, rect2) -> rect1.createUnion(rect2).getBounds2D()));
-            return map2;
-        }).orElse(bBoxPerPage);
-    }
-
-
-    /**
-     * @param bBoxPerPage initial empty BoundingBox
-     * @return The union of all BoundingBoxes of the ClassificationTextBlock of this node
-     */
-    private Map<PageNode, Rectangle2D> getBBoxFromTerminalTextBlock(Map<PageNode, Rectangle2D> bBoxPerPage) {
-
-        Map<PageNode, List<AtomicTextBlock>> atomicTextBlockPerPage = buildTextBlock().getAtomicTextBlocks().stream().collect(Collectors.groupingBy(AtomicTextBlock::getPage));
-        atomicTextBlockPerPage.forEach((page, atbs) -> bBoxPerPage.put(page, RectangleTransformations.bBoxUnionAtomicTextBlock(atbs)));
-        return bBoxPerPage;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/TableCellNode.java

@@ -1,92 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableCellNode implements SemanticNode {
-
-    List<Integer> tocId;
-    int row;
-    int col;
-    boolean header;
-
-    Rectangle2D bBox;
-
-    @Builder.Default
-    boolean terminal = true;
-    TextBlock terminalTextBlock;
-
-    TextBlock textBlock;
-
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public Map<PageNode, Rectangle2D> getBBox() {
-
-        Map<PageNode, Rectangle2D> bBoxPerPage = new HashMap<>();
-        getPages().forEach(page -> bBoxPerPage.put(page, bBox));
-        return bBoxPerPage;
-    }
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        if (terminal) {
-            return terminalTextBlock;
-        }
-
-        if (textBlock == null) {
-            textBlock = streamAllSubNodes().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-        }
-        return textBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + NodeType.TABLE_CELL + ": " + buildTextBlock().buildSummary();
-    }
-
-
-    public boolean hasHeader(String headerString) {
-
-        return getHeaders().anyMatch(header -> header.buildTextBlock().getSearchText().strip().equals(headerString));
-    }
-
-
-    private Stream<TableCellNode> getHeaders() {
-
-        TableNode tableNode = (TableNode) getParent();
-        return tableNode.streamHeadersForCell(row, col);
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/nodes/TableNode.java

@@ -1,73 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableNode implements SemanticNode {
-
-    List<Integer> tocId;
-    TableOfContents tableOfContents;
-
-    Integer numberOfRows;
-    Integer numberOfCols;
-
-    TextBlock textBlock;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    public Stream<TableCellNode> streamTableCells() {
-
-        return streamChildren().map(node -> (TableCellNode) node);
-    }
-
-
-    public Stream<TableCellNode> streamHeaders() {
-
-        return streamTableCells().filter(TableCellNode::isHeader);
-    }
-
-
-    public Stream<TableCellNode> streamHeadersForCell(int row, int col) {
-
-        return streamHeaders().filter(cell -> cell.getRow() == row || cell.getCol() == col);
-    }
-
-
-    @Override
-    public TextBlock buildTextBlock() {
-
-        if (textBlock == null) {
-            textBlock = streamAllSubNodes().filter(SemanticNode::isTerminal).map(SemanticNode::getTerminalTextBlock).collect(new TextBlockCollector());
-        }
-        return textBlock;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId.toString() + ": " + NodeType.TABLE + ": " + buildTextBlock().buildSummary();
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/graph/textblock/AtomicTextBlock.java

@@ -1,131 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.Boundary;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityPosition;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.services.RectangleTransformations;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class AtomicTextBlock implements TextBlock {
-
-    Long id;
-    Integer numberOnPage;
-    PageNode page;
-
-    //string coordinates
-    Boundary boundary;
-    String searchText;
-    List<Integer> lineBreaks;
-
-    //position coordinates
-    List<Integer> stringIdxToPositionIdx;
-    List<Rectangle2D> positions;
-
-    @EqualsAndHashCode.Exclude
-    SemanticNode parent;
-
-
-    @Override
-    public int numberOfLines() {
-
-        return lineBreaks.size() + 1;
-    }
-
-
-    public CharSequence getLine(int lineNumber) {
-
-        if (lineNumber >= numberOfLines() || lineNumber < 0) {
-            throw new IndexOutOfBoundsException(String.format("line %d out of range for AtomicTextBlock with %d lines", lineNumber, numberOfLines()));
-        }
-        if (lineNumber == 0) {
-            return subSequence(boundary.start(), lineBreaks.get(0) + boundary.start());
-        } else if (lineNumber == numberOfLines() - 1) {
-            return subSequence(lineBreaks.get(lineBreaks.size() - 1) + boundary.start(), boundary.end());
-        }
-        return subSequence(lineBreaks.get(lineNumber - 1) + boundary.start(), lineBreaks.get(lineNumber) + boundary.start());
-    }
-
-
-    @Override
-    public List<AtomicTextBlock> getAtomicTextBlocks() {
-
-        return List.of(this);
-    }
-
-
-    @Override
-    public int getNextLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                .filter(linebreak -> linebreak > fromIndex - boundary.start()) //
-                .findFirst() //
-                .orElse(searchText.length()) + boundary.start();
-    }
-
-
-    @Override
-    public int getPreviousLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                .filter(linebreak -> linebreak <= fromIndex - boundary.start())//
-                .reduce((a, b) -> b)//
-                .orElse(0) + boundary.start();
-    }
-
-
-    @Override
-    public Rectangle2D getPosition(int stringIdx) {
-
-        return positions.get(stringIdxToPositionIdx.get(stringIdx - boundary.start()));
-    }
-
-
-    @Override
-    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
-
-        if (!containsBoundary(stringBoundary)) {
-            throw new IndexOutOfBoundsException(String.format("%s is out of bounds for %s", stringBoundary, this.boundary));
-        }
-
-        if (stringBoundary.end() == this.boundary.end()) {
-            return positions.subList(stringIdxToPositionIdx.get(stringBoundary.start() - this.boundary.start()), positions.size());
-        }
-
-        return positions.subList(stringIdxToPositionIdx.get(stringBoundary.start() - this.boundary.start()),
-                stringIdxToPositionIdx.get(stringBoundary.end() - this.boundary.start()));
-    }
-
-
-    public List<EntityPosition> getEntityPositionsPerPage(Boundary stringBoundary) {
-
-        List<Rectangle2D> positionsPerLine = stringBoundary.split(getLineBreaks().stream().map(lb -> lb + boundary.start()).filter(stringBoundary::contains).toList())
-                .stream()
-                .map(this::getPositions)
-                .map(RectangleTransformations::rectangleUnion)
-                .toList();
-
-        return List.of(EntityPosition.builder().rectanglePerLine(positionsPerLine).pageNode(page).build());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return searchText;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/mapper/DocumentDataMapper.java

@@ -1,146 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.mapper;
-
-import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicPositionBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicTextBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.DocumentData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.PageData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.TableOfContentsData;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.DocumentGraph;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableCellNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class DocumentDataMapper {
-
-    public DocumentData toDocumentData(DocumentGraph documentGraph) {
-
-        List<AtomicTextBlockData> atomicTextBlockData = documentGraph.streamTerminalTextBlocksInOrder()
-                .flatMap(textBlock -> textBlock.getAtomicTextBlocks().stream())
-                .distinct()
-                .map(DocumentDataMapper::toAtomicTextBlockData)
-                .toList();
-
-        List<AtomicPositionBlockData> atomicPositionBlockData = documentGraph.streamTerminalTextBlocksInOrder()
-                .flatMap(textBlock -> textBlock.getAtomicTextBlocks().stream())
-                .distinct()
-                .map(DocumentDataMapper::toAtomicPositionBlockData)
-                .toList();
-
-        List<PageData> pageData = documentGraph.getPages().stream().map(DocumentDataMapper::toPageData).toList();
-        TableOfContentsData tableOfContentsData = toTableOfContentsData(documentGraph.getTableOfContents());
-        return DocumentData.builder()
-                .atomicTextBlocks(atomicTextBlockData.toArray(new AtomicTextBlockData[0]))
-                .atomicPositionBlocks(atomicPositionBlockData.toArray(new AtomicPositionBlockData[0]))
-                .pages(pageData.toArray(new PageData[0]))
-                .tableOfContents(tableOfContentsData)
-                .build();
-    }
-
-
-    private TableOfContentsData toTableOfContentsData(TableOfContents tableOfContents) {
-
-        return new TableOfContentsData(toEntryData(tableOfContents.getRoot()));
-    }
-
-
-    private TableOfContentsData.EntryData toEntryData(TableOfContents.Entry entry) {
-
-        Long[] atomicTextBlocks;
-
-        if (entry.getNode().isTerminal()) {
-            atomicTextBlocks = toAtomicTextBlockIds(entry.getNode().getTerminalTextBlock());
-        } else {
-            atomicTextBlocks = new Long[]{};
-        }
-
-        Map<String, String> properties = switch (entry.getType()) {
-            case TABLE -> PropertiesMapper.buildTableProperties((TableNode) entry.getNode());
-            case TABLE_CELL -> PropertiesMapper.buildTableCellProperties((TableCellNode) entry.getNode());
-            case IMAGE -> PropertiesMapper.buildImageProperties((ImageNode) entry.getNode());
-            default -> new HashMap<>();
-        };
-
-        return TableOfContentsData.EntryData.builder()
-                .tocId(toPrimitiveIntArray(entry.getTocId()))
-                .subEntries(entry.getChildren().stream().map(DocumentDataMapper::toEntryData).toList())
-                .type(entry.getType())
-                .atomicBlocks(atomicTextBlocks)
-                .pages(entry.getNode().getPages().stream().map(PageNode::getNumber).map(Integer::longValue).toArray(Long[]::new))
-                .properties(properties)
-                .build();
-    }
-
-
-    private Long[] toAtomicTextBlockIds(TextBlock textBlock) {
-
-        return textBlock.getAtomicTextBlocks().stream().map(AtomicTextBlock::getId).toArray(Long[]::new);
-    }
-
-
-    private PageData toPageData(PageNode p) {
-
-        return PageData.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).build();
-    }
-
-
-    private AtomicTextBlockData toAtomicTextBlockData(AtomicTextBlock atomicTextBlock) {
-
-        return AtomicTextBlockData.builder()
-                .id(atomicTextBlock.getId())
-                .page(atomicTextBlock.getPage().getNumber().longValue())
-                .searchText(atomicTextBlock.getSearchText())
-                .numberOnPage(atomicTextBlock.getNumberOnPage())
-                .start(atomicTextBlock.getBoundary().start())
-                .end(atomicTextBlock.getBoundary().end())
-                .lineBreaks(toPrimitiveIntArray(atomicTextBlock.getLineBreaks()))
-                .build();
-    }
-
-
-    private AtomicPositionBlockData toAtomicPositionBlockData(AtomicTextBlock atomicTextBlock) {
-
-        return AtomicPositionBlockData.builder()
-                .id(atomicTextBlock.getId())
-                .positions(toPrimitiveFloatMatrix(atomicTextBlock.getPositions()))
-                .stringIdxToPositionIdx(toPrimitiveIntArray(atomicTextBlock.getStringIdxToPositionIdx()))
-                .build();
-    }
-
-
-    private float[][] toPrimitiveFloatMatrix(List<Rectangle2D> positions) {
-
-        float[][] positionMatrix = new float[positions.size()][];
-        for (int i = 0; i < positions.size(); i++) {
-            float[] singlePositions = new float[4];
-            singlePositions[0] = (float) positions.get(i).getMinX();
-            singlePositions[1] = (float) positions.get(i).getMinY();
-            singlePositions[2] = (float) positions.get(i).getWidth();
-            singlePositions[3] = (float) positions.get(i).getHeight();
-            positionMatrix[i] = singlePositions;
-        }
-        return positionMatrix;
-    }
-
-
-    private int[] toPrimitiveIntArray(List<Integer> list) {
-
-        int[] array = new int[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            array[i] = list.get(i);
-        }
-        return array;
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/mapper/DocumentGraphMapper.java

@@ -1,229 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.mapper;
-
-import static com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType.FOOTER;
-import static com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType.HEADER;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import com.google.common.primitives.Ints;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicPositionBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicTextBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.DocumentData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.PageData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.TableOfContentsData;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.Boundary;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.DocumentGraph;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.FooterNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.HeaderNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.HeadlineNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ParagraphNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SectionNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableCellNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlockCollector;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class DocumentGraphMapper {
-
-    public DocumentGraph toDocumentGraph(DocumentData documentData) {
-
-
-        DocumentGraph documentGraph = new DocumentGraph();
-        Context context = new Context(documentData,
-                new TableOfContents(documentGraph),
-                new LinkedList<>(),
-                new LinkedList<>(),
-                Arrays.stream(documentData.getAtomicTextBlocks()).toList(),
-                Arrays.stream(documentData.getAtomicPositionBlocks()).toList());
-
-        context.pages.addAll(Arrays.stream(documentData.getPages()).map(DocumentGraphMapper::buildPage).toList());
-
-        context.tableOfContents.getRoot().getChildren().addAll(buildEntries(documentData.getTableOfContents().getRoot().getSubEntries(), context));
-
-        documentGraph.setTableOfContents(context.tableOfContents);
-        documentGraph.setPages(new HashSet<>(context.pages));
-        documentGraph.setNumberOfPages(documentData.getPages().length);
-
-        documentGraph.setTextBlock(documentGraph.buildTextBlock());
-        return documentGraph;
-    }
-
-
-    private List<TableOfContents.Entry> buildEntries(List<TableOfContentsData.EntryData> entries,
-                                                     Context context) {
-
-        List<TableOfContents.Entry> newEntries = new LinkedList<>();
-        for (TableOfContentsData.EntryData entryData : entries) {
-
-            boolean terminal = isTerminal(entryData);
-            List<PageNode> pages = Arrays.stream(entryData.getPages()).map(pageNumber -> getPage(pageNumber, context)).toList();
-
-            SemanticNode node = switch (entryData.getType()) {
-                case SECTION -> buildSection(context);
-                case PARAGRAPH -> buildParagraph(context, terminal);
-                case HEADLINE -> buildHeadline(context, terminal);
-                case HEADER -> buildHeader(context, terminal);
-                case FOOTER -> buildFooter(context, terminal);
-                case TABLE -> buildTable(context, entryData.getProperties());
-                case TABLE_CELL -> buildTableCell(context, entryData.getProperties(), terminal);
-                case IMAGE -> buildImage(context, entryData.getProperties());
-                default -> throw new UnsupportedOperationException("Not yet implemented for type " + entryData.getType());
-            };
-
-            if (node.isTerminal()) {
-                TextBlock textBlock = toTextBlock(entryData.getAtomicBlocks(), context, node);
-                node.setTerminalTextBlock(textBlock);
-            }
-            List<Integer> tocId = Arrays.stream(entryData.getTocId()).boxed().toList();
-            node.setTocId(tocId);
-
-            if (entryData.getType() == HEADER) {
-                pages.forEach(page -> page.setHeader((HeaderNode) node));
-            } else if (entryData.getType() == FOOTER) {
-                pages.forEach(page -> page.setFooter((FooterNode) node));
-            } else {
-                pages.forEach(page -> page.getMainBody().add(node));
-            }
-            newEntries.add(TableOfContents.Entry.builder().tocId(tocId).type(entryData.getType()).children(buildEntries(entryData.getSubEntries(), context)).node(node).build());
-        }
-        return newEntries;
-    }
-
-
-    private HeadlineNode buildHeadline(Context context, boolean terminal) {
-
-        return HeadlineNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private static boolean isTerminal(TableOfContentsData.EntryData entryData) {
-
-        return entryData.getAtomicBlocks().length > 0;
-    }
-
-
-    private ImageNode buildImage(Context context, Map<String, String> properties) {
-
-        var builder = ImageNode.builder();
-        PropertiesMapper.parseImageProperties(properties, builder);
-        return builder.tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private TableCellNode buildTableCell(Context context, Map<String, String> properties, boolean terminal) {
-
-        TableCellNode.TableCellNodeBuilder builder = TableCellNode.builder();
-        PropertiesMapper.parseTableCellProperties(properties, builder);
-        return builder.terminal(terminal).tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private TableNode buildTable(Context context, Map<String, String> properties) {
-
-        TableNode.TableNodeBuilder builder = TableNode.builder();
-        PropertiesMapper.parseTableProperties(properties, builder);
-        return TableNode.builder().tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private FooterNode buildFooter(Context context, boolean terminal) {
-
-        return FooterNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private HeaderNode buildHeader(Context context, boolean terminal) {
-
-        return HeaderNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private SectionNode buildSection(Context context) {
-
-        return SectionNode.builder().tableOfContents(context.tableOfContents()).build();
-
-    }
-
-
-    private ParagraphNode buildParagraph(Context context, boolean terminal) {
-
-        return ParagraphNode.builder().terminal(terminal).tableOfContents(context.tableOfContents()).build();
-    }
-
-
-    private TextBlock toTextBlock(Long[] atomicTextBlockIds, Context context, SemanticNode parent) {
-
-        return Arrays.stream(atomicTextBlockIds)
-                .map(atomicTextBlockId -> toAtomicTextBlock(context.atomicTextBlockData.get(Math.toIntExact(atomicTextBlockId)),
-                        context.atomicPositionBlockData.get(Math.toIntExact(atomicTextBlockId)),
-                        parent,
-                        context))
-                .collect(new TextBlockCollector());
-    }
-
-
-    private PageNode buildPage(PageData p) {
-
-        return PageNode.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).mainBody(new LinkedList<>()).build();
-    }
-
-
-    private AtomicTextBlock toAtomicTextBlock(AtomicTextBlockData atomicTextBlockData,
-                                              AtomicPositionBlockData atomicPositionBlockData,
-                                              SemanticNode parent,
-                                              Context context) {
-
-        return AtomicTextBlock.builder()
-                .id(atomicTextBlockData.getId())
-                .numberOnPage(atomicTextBlockData.getNumberOnPage())
-                .page(getPage(atomicTextBlockData.getPage(), context))
-                .boundary(new Boundary(atomicTextBlockData.getStart(), atomicTextBlockData.getEnd()))
-                .searchText(atomicTextBlockData.getSearchText())
-                .lineBreaks(Ints.asList(atomicTextBlockData.getLineBreaks()))
-                .stringIdxToPositionIdx(Ints.asList(atomicPositionBlockData.getStringIdxToPositionIdx()))
-                .positions(toRectangle2DList(atomicPositionBlockData.getPositions()))
-                .parent(parent)
-                .build();
-    }
-
-
-    private static List<Rectangle2D> toRectangle2DList(float[][] positions) {
-
-        return Arrays.stream(positions).map(floatArr -> (Rectangle2D) new Rectangle2D.Float(floatArr[0], floatArr[1], floatArr[2], floatArr[3])).toList();
-    }
-
-
-    private PageNode getPage(Long pageIndex, Context context) {
-
-        return context.pages.stream()
-                .filter(page -> page.getNumber() == Math.toIntExact(pageIndex))
-                .findFirst()
-                .orElseThrow(() -> new NoSuchElementException(String.format("ClassificationPage with number %d not found", pageIndex)));
-    }
-
-
-    record Context(
-            DocumentData layoutParsingModel,
-            TableOfContents tableOfContents,
-            List<PageNode> pages,
-            List<SectionNode> sections,
-            List<AtomicTextBlockData> atomicTextBlockData,
-            List<AtomicPositionBlockData> atomicPositionBlockData) {
-
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/mapper/PropertiesMapper.java

@@ -1,101 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.mapper;
-
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageType;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableCellNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.services.RectangleTransformations;
-
-public class PropertiesMapper {
-
-    public static Map<String, String> buildImageProperties(ImageNode image) {
-
-        Map<String, String> properties = new HashMap<>();
-        properties.put("imageType", image.getImageType().toString());
-        properties.put("transparency", String.valueOf(image.isTransparency()));
-        properties.put("position", RectangleTransformations.toString(image.getPosition()));
-        return properties;
-    }
-
-
-    public static Map<String, String> buildTableCellProperties(TableCellNode tableCell) {
-
-        Map<String, String> properties = new HashMap<>();
-        properties.put("row", String.valueOf(tableCell.getRow()));
-        properties.put("col", String.valueOf(tableCell.getCol()));
-        properties.put("header", String.valueOf(tableCell.isHeader()));
-
-        if (tableCell.getPages().size() > 1 || tableCell.getBBox().keySet().size() > 1) {
-            throw new IllegalArgumentException("TableCell can only occur on a single page!");
-        }
-        String bBoxString = RectangleTransformations.toString(tableCell.getBBox().get(tableCell.getPages().stream().findFirst().get()));
-        properties.put("bBox", bBoxString);
-
-        return properties;
-    }
-
-
-    public static Map<String, String> buildTableProperties(TableNode table) {
-
-        Map<String, String> properties = new HashMap<>();
-        properties.put("numberOfRows", String.valueOf(table.getNumberOfRows()));
-        properties.put("numberOfCols", String.valueOf(table.getNumberOfCols()));
-        return properties;
-    }
-
-
-    public static void parseImageProperties(Map<String, String> properties, ImageNode.ImageNodeBuilder builder) {
-
-        builder.imageType(parseImageType(properties.get("imageType")));
-        builder.transparency(Boolean.parseBoolean(properties.get("transparency")));
-        builder.position(parseRectangle2D(properties.get("position")));
-    }
-
-
-    public static void parseTableCellProperties(Map<String, String> properties, TableCellNode.TableCellNodeBuilder builder) {
-
-        builder.row(Integer.parseInt(properties.get("row")));
-        builder.col(Integer.parseInt(properties.get("col")));
-        builder.header(Boolean.parseBoolean(properties.get("header")));
-        builder.bBox(parseRectangle2D(properties.get("bBox")));
-    }
-
-
-    public static void parseTableProperties(Map<String, String> properties, TableNode.TableNodeBuilder builder) {
-
-        builder.numberOfRows(Integer.parseInt(properties.get("numberOfRows")));
-        builder.numberOfCols(Integer.parseInt(properties.get("numberOfCols")));
-    }
-
-
-    private static ImageType parseImageType(String imageType) {
-
-        return switch (imageType) {
-            case "LOGO" -> ImageType.LOGO;
-            case "FORMULA" -> ImageType.FORMULA;
-            case "SIGNATURE" -> ImageType.SIGNATURE;
-            case "OCR" -> ImageType.OCR;
-            default -> ImageType.OTHER;
-        };
-    }
-
-
-    public static String toString(Rectangle2D rectangle2D) {
-
-        return String.format("%f,%f,%f,%f", rectangle2D.getX(), rectangle2D.getY(), rectangle2D.getWidth(), rectangle2D.getHeight());
-    }
-
-
-    public static Rectangle2D parseRectangle2D(String bBox) {
-
-        List<Float> floats = Arrays.stream(bBox.split(",")).map(Float::parseFloat).toList();
-        return new Rectangle2D.Float(floats.get(0), floats.get(1), floats.get(2), floats.get(3));
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingQueueNames.java

@@ -2,7 +2,7 @@ package com.knecon.fforesight.service.layoutparser.internal.api.queue;
 
 public class LayoutParsingQueueNames {
 
-    public static final String LAYOUT_PARSING_REQUEST_QUEUE = "LAYOUTPARSING_REQUEST_QUEUE";
-    public static final String LAYOUT_PARSING_DLQ = "LAYOUTPARSING_DLQ";
-    public static final String LAYOUT_PARSING_FINISHED_EVENT_QUEUE = "LAYOUTPARSING_FINISHED_EVENT_QUEUE";
+    public static final String LAYOUT_PARSING_REQUEST_QUEUE = "layout_parsing_request_queue";
+    public static final String LAYOUT_PARSING_DLQ = "layout_parsing_dead_letter_queue";
+    public static final String LAYOUT_PARSING_FINISHED_EVENT_QUEUE = "layout_parsing_response_queue";
 }

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingRequest.java

@@ -8,13 +8,16 @@ import lombok.Builder;
 
 @Builder
 public record LayoutParsingRequest(
+        LayoutParsingType layoutParsingType,
         Map<String, String> identifier,
         String originFileStorageId,
         Optional<String> tablesFileStorageId,
         Optional<String> imagesFileStorageId,
         String structureFileStorageId,
+        String researchDocumentStorageId,
         String textBlockFileStorageId,
         String positionBlockFileStorageId,
-        String pageFileStorageId) {
+        String pageFileStorageId,
+        String sectionGridStorageId) {
 
 }

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingType.java

@@ -0,0 +1,7 @@
+package com.knecon.fforesight.service.layoutparser.internal.api.queue;
+
+public enum LayoutParsingType {
+    REDACT_MANAGER,
+    TAAS,
+    DOCUMINE
+}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/services/EntityEnrichmentService.java

@@ -1,10 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.services;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-public interface EntityEnrichmentService {
-
-    void enrichEntity(EntityNode entity, TextBlock textBlock);
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/services/EntityInsertionService.java

@@ -1,56 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.services;
-
-import java.util.Collections;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.entity.EntityNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-public class EntityInsertionService {
-
-    private final EntityEnrichmentService entityEnrichmentService;
-
-
-    public void addEntityToGraph(EntityNode entity, TableOfContents tableOfContents) {
-
-        try {
-            SemanticNode containingNode = tableOfContents.streamChildrenNodes(Collections.emptyList())
-                    .filter(node -> node.buildTextBlock().containsBoundary(entity.getBoundary()))
-                    .findFirst()
-                    .orElseThrow(() -> new NoSuchElementException("No containing Node found!"));
-
-            containingNode.addThisToEntityIfIntersects(entity);
-
-            TextBlock textBlock = entity.getDeepestFullyContainingNode().buildTextBlock();
-            entityEnrichmentService.enrichEntity(entity, textBlock);
-
-            addToPages(entity);
-            addToNodeEntitySets(entity);
-
-        } catch (NoSuchElementException e) {
-            entity.removeFromGraph();
-        }
-    }
-
-
-    private void addToPages(EntityNode entity) {
-
-        Set<PageNode> pages = entity.getDeepestFullyContainingNode().getPages();
-        entity.getPages().addAll(pages);
-        pages.forEach(page -> page.getEntities().add(entity));
-    }
-
-
-    private void addToNodeEntitySets(EntityNode entity) {
-
-        entity.getIntersectingNodes().forEach(node -> node.getEntities().add(entity));
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/services/RectangleTransformations.java

@@ -1,95 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.services;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class RectangleTransformations {
-
-    public static Rectangle2D pad(Rectangle2D rectangle2D, int deltaX, int deltaY) {
-
-        return new Rectangle2D.Double(rectangle2D.getMinX() - deltaX, rectangle2D.getMinY() - deltaY, rectangle2D.getWidth() + 2 * deltaX, rectangle2D.getHeight() + 2 * deltaY);
-    }
-
-
-    public static Rectangle2D bBoxUnionAtomicTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
-
-        return atomicTextBlocks.stream().flatMap(atomicTextBlock -> atomicTextBlock.getPositions().stream()).collect(new Rectangle2DUnion());
-    }
-
-
-    public static Rectangle2D rectangleUnion(List<Rectangle2D> rectangle2DList) {
-
-        return rectangle2DList.stream().collect(new Rectangle2DUnion());
-    }
-
-
-    public static String toString(Rectangle2D rectangle2D) {
-
-        return format("%f,%f,%f,%f", rectangle2D.getX(), rectangle2D.getY(), rectangle2D.getWidth(), rectangle2D.getHeight());
-    }
-
-
-    public static Rectangle2D parseRectangle2D(String bBox) {
-
-        List<Float> floats = Arrays.stream(bBox.split(",")).map(Float::parseFloat).toList();
-        return new Rectangle2D.Float(floats.get(0), floats.get(1), floats.get(2), floats.get(3));
-    }
-
-
-    private static class Rectangle2DUnion implements Collector<Rectangle2D, Area, Rectangle2D> {
-
-        @Override
-        public Supplier<Area> supplier() {
-
-            return Area::new;
-        }
-
-
-        @Override
-        public BiConsumer<Area, Rectangle2D> accumulator() {
-
-            return (area, rectangle2D) -> area.add(new Area(rectangle2D));
-        }
-
-
-        @Override
-        public BinaryOperator<Area> combiner() {
-
-            return (area1, area2) -> {
-                area1.add(area2);
-                return area1;
-            };
-        }
-
-
-        @Override
-        public Function<Area, Rectangle2D> finisher() {
-
-            return Area::getBounds2D;
-        }
-
-
-        @Override
-        public Set<Characteristics> characteristics() {
-
-            return Set.of(Characteristics.CONCURRENT, Characteristics.UNORDERED);
-        }
-
-    }
-
-}

layoutparser-service/layoutparser-service-internal-api/src/test/resources/log4j2-test.xml

@@ -0,0 +1,16 @@
+<Configuration>
+
+    <Appenders>
+        <Console name="CONSOLE" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Root level="warn">
+            <AppenderRef ref="CONSOLE"/>
+        </Root>
+        <Logger name="com.iqser" level="info"/>
+    </Loggers>
+
+</Configuration>

layoutparser-service/layoutparser-service-processor/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    id("com.knecon.fforesight.java-conventions")
+    id("io.freefair.lombok") version "8.1.0"
+}
+
+dependencies {
+    implementation(project(":layoutparser-service-internal-api"))
+
+    implementation("com.iqser.red.service:persistence-service-shared-api-v1:2.36.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.10.0")
+    implementation("com.iqser.red.commons:storage-commons:2.1.0")
+
+    implementation("org.apache.pdfbox:pdfbox:3.0.0-alpha2")
+    implementation("org.apache.pdfbox:pdfbox-tools:3.0.0-alpha2")
+    implementation("com.fasterxml.jackson.module:jackson-module-afterburner:2.15.0-rc2")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.0-rc2")
+    implementation("org.springframework.boot:spring-boot-starter-web:3.0.6")
+    implementation("org.springframework.boot:spring-boot-starter-amqp:3.0.6")
+}
+
+description = "layoutparser-service-processor"

layoutparser-service/layoutparser-service-processor/pom.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.knecon.fforesight</groupId>
-        <artifactId>layoutparser-service</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>layoutparser-service-processor</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-internal-api-v1</artifactId>
-            <version>2.36.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.knecon.fforesight</groupId>
-            <artifactId>layoutparser-service-internal-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>storage-commons</artifactId>
-            <version>1.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>spring-commons</artifactId>
-            <version>6.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>1.10.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>${pdfbox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox-tools</artifactId>
-            <version>${pdfbox.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-afterburner</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-</project>

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java

@@ -0,0 +1,143 @@
+package com.knecon.fforesight.service.layoutparser.processor;
+
+import static java.lang.String.format;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+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.model.ClassificationDocument;
+import com.knecon.fforesight.service.layoutparser.processor.services.PdfParsingService;
+import com.knecon.fforesight.service.layoutparser.processor.services.SectionGridCreatorService;
+import com.knecon.fforesight.service.layoutparser.processor.services.SectionsBuilderService;
+import com.knecon.fforesight.service.layoutparser.processor.services.classification.DocuMineClassificationService;
+import com.knecon.fforesight.service.layoutparser.processor.services.classification.RedactManagerClassificationService;
+import com.knecon.fforesight.service.layoutparser.processor.services.classification.TaasClassificationService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class LayoutParsingPipeline {
+
+    private final ImageServiceResponseAdapter imageServiceResponseAdapter;
+    private final CvTableParsingAdapter cvTableParsingAdapter;
+    private final LayoutParsingStorageService layoutParsingStorageService;
+    private final PdfParsingService pdfParsingService;
+    private final SectionsBuilderService sectionsBuilderService;
+    private final SectionGridCreatorService sectionGridCreatorService;
+    private final TaasClassificationService taasClassificationService;
+    private final RedactManagerClassificationService redactManagerClassificationService;
+    private final DocuMineClassificationService docuMineClassificationService;
+
+
+    public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
+
+        long start = System.currentTimeMillis();
+
+        try (PDDocument originDocument = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId())) {
+            ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
+            if (layoutParsingRequest.imagesFileStorageId().isPresent()) {
+                imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.pageFileStorageId());
+            }
+
+            TableServiceResponse tableServiceResponse = new TableServiceResponse();
+            if (layoutParsingRequest.tablesFileStorageId().isPresent()) {
+                tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.pageFileStorageId());
+            }
+
+            Document documentGraph = parseLayout(layoutParsingRequest.layoutParsingType(), originDocument, imageServiceResponse, tableServiceResponse);
+            int numberOfPages = originDocument.getNumberOfPages();
+
+            layoutParsingStorageService.storeSectionGrid(layoutParsingRequest, sectionGridCreatorService.createSectionGrid(documentGraph));
+            layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
+
+            if (layoutParsingRequest.layoutParsingType().equals(LayoutParsingType.TAAS)) {
+                var researchDocumentData = TaasDocumentDataMapper.fromDocument(documentGraph);
+                layoutParsingStorageService.storeResearchDocumentData(layoutParsingRequest, researchDocumentData);
+            }
+
+            return LayoutParsingFinishedEvent.builder()
+                    .identifier(layoutParsingRequest.identifier())
+                    .numberOfPages(numberOfPages)
+                    .duration(System.currentTimeMillis() - start)
+                    .message(format("Layout parsing is finished and files have been saved with Ids:\n Structure: %s\nText: %s\nPositions: %s\nPageData: %s",
+                            layoutParsingRequest.structureFileStorageId(),
+                            layoutParsingRequest.textBlockFileStorageId(),
+                            layoutParsingRequest.positionBlockFileStorageId(),
+                            layoutParsingRequest.pageFileStorageId()))
+                    .build();
+        }
+    }
+
+
+    public Document parseLayout(LayoutParsingType layoutParsingType,
+                                PDDocument originDocument,
+                                ImageServiceResponse imageServiceResponse,
+                                TableServiceResponse tableServiceResponse) {
+
+        ClassificationDocument classificationDocument = pdfParsingService.parseDocument(layoutParsingType,
+                originDocument,
+                cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse),
+                imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse));
+
+        switch (layoutParsingType) {
+            case TAAS -> taasClassificationService.classifyDocument(classificationDocument);
+            case DOCUMINE -> docuMineClassificationService.classifyDocument(classificationDocument);
+            case REDACT_MANAGER -> redactManagerClassificationService.classifyDocument(classificationDocument);
+        }
+
+        sectionsBuilderService.buildSections(classificationDocument);
+        sectionsBuilderService.addImagesToSections(classificationDocument);
+
+        return DocumentGraphFactory.buildDocumentGraph(classificationDocument);
+    }
+
+
+    public Document parseLayoutWithTimer(LayoutParsingType layoutParsingType,
+                                         PDDocument originDocument,
+                                         ImageServiceResponse imageServiceResponse,
+                                         TableServiceResponse tableServiceResponse) {
+
+        long start = System.currentTimeMillis();
+
+        ClassificationDocument classificationDocument = pdfParsingService.parseDocument(layoutParsingType,
+                originDocument,
+                cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse),
+                imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse));
+
+        System.out.printf("parsed %d ms", System.currentTimeMillis() - start);
+
+        start = System.currentTimeMillis();
+        switch (layoutParsingType) {
+            case TAAS -> taasClassificationService.classifyDocument(classificationDocument);
+            case DOCUMINE -> docuMineClassificationService.classifyDocument(classificationDocument);
+            case REDACT_MANAGER -> redactManagerClassificationService.classifyDocument(classificationDocument);
+        }
+        System.out.printf(", classified %d ms", System.currentTimeMillis() - start);
+
+        start = System.currentTimeMillis();
+        sectionsBuilderService.buildSections(classificationDocument);
+        System.out.printf(", sections built %d ms", System.currentTimeMillis() - start);
+
+        start = System.currentTimeMillis();
+        Document document = DocumentGraphFactory.buildDocumentGraph(classificationDocument);
+        System.out.printf(", graph constructed %d ms", System.currentTimeMillis() - start);
+        return document;
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingService.java

@@ -1,88 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor;
-
-import static java.lang.String.format;
-
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.stereotype.Service;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.DocumentGraph;
-import com.knecon.fforesight.service.layoutparser.internal.api.mapper.DocumentDataMapper;
-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.classification.dto.ClassificationDocument;
-import com.knecon.fforesight.service.layoutparser.processor.classification.service.ClassificationService;
-import com.knecon.fforesight.service.layoutparser.processor.classification.service.PdfParsingService;
-import com.knecon.fforesight.service.layoutparser.processor.classification.service.SectionsBuilderService;
-import com.knecon.fforesight.service.layoutparser.processor.factory.DocumentGraphFactory;
-import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent;
-import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class LayoutParsingService {
-
-    private final ImageServiceResponseAdapter imageServiceResponseAdapter;
-    private final CvTableParsingAdapter cvTableParsingAdapter;
-    private final LayoutParsingStorageService layoutParsingStorageService;
-    private final PdfParsingService pdfParsingService;
-    private final ClassificationService classificationService;
-    private final SectionsBuilderService sectionsBuilderService;
-    private final DocumentGraphFactory documentGraphFactory;
-
-
-    public LayoutParsingFinishedEvent parseLayoutAndSaveFilesToStorage(LayoutParsingRequest layoutParsingRequest) throws IOException {
-
-        long start = System.currentTimeMillis();
-        PDDocument originDocument = layoutParsingStorageService.getOriginFile(layoutParsingRequest.originFileStorageId());
-
-        ImageServiceResponse imageServiceResponse = new ImageServiceResponse();
-        if (layoutParsingRequest.imagesFileStorageId().isPresent()) {
-            imageServiceResponse = layoutParsingStorageService.getImagesFile(layoutParsingRequest.pageFileStorageId());
-        }
-
-        TableServiceResponse tableServiceResponse = new TableServiceResponse();
-        if (layoutParsingRequest.tablesFileStorageId().isPresent()) {
-            tableServiceResponse = layoutParsingStorageService.getTablesFile(layoutParsingRequest.pageFileStorageId());
-        }
-
-        DocumentGraph documentGraph = parseLayout(originDocument, imageServiceResponse, tableServiceResponse);
-        int numberOfPages = originDocument.getNumberOfPages();
-        originDocument.close();
-
-        layoutParsingStorageService.storeDocumentData(layoutParsingRequest, DocumentDataMapper.toDocumentData(documentGraph));
-
-        return LayoutParsingFinishedEvent.builder()
-                .identifier(layoutParsingRequest.identifier())
-                .numberOfPages(numberOfPages)
-                .duration(System.currentTimeMillis() - start)
-                .message(format("Layout parsing is finished and files have been saved with Ids:\n Structure: %s\nText: %s\nPositions: %s\nPageData: %s",
-                        layoutParsingRequest.structureFileStorageId(),
-                        layoutParsingRequest.textBlockFileStorageId(),
-                        layoutParsingRequest.positionBlockFileStorageId(),
-                        layoutParsingRequest.pageFileStorageId()))
-                .build();
-    }
-
-
-    public DocumentGraph parseLayout(PDDocument originDocument, ImageServiceResponse imageServiceResponse, TableServiceResponse tableServiceResponse) {
-
-        ClassificationDocument classificationDocument = pdfParsingService.parseDocument(originDocument,
-                cvTableParsingAdapter.buildCvParsedTablesPerPage(tableServiceResponse),
-                imageServiceResponseAdapter.buildClassifiedImagesPerPage(imageServiceResponse));
-
-        classificationService.classifyDocument(classificationDocument);
-
-        sectionsBuilderService.buildSections(classificationDocument);
-
-        return documentGraphFactory.buildDocumentGraph(classificationDocument);
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingStorageService.java

@@ -13,16 +13,18 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
 import com.iqser.red.storage.commons.service.StorageService;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicPositionBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.AtomicTextBlockData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.DocumentData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.PageData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.TableOfContentsData;
+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.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.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.multitenancy.TenantContext;
-import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest;
+import com.knecon.fforesight.tenantcommons.TenantContext;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -67,34 +69,43 @@ public class LayoutParsingStorageService {
     }
 
 
-    public void storeDocumentData(LayoutParsingRequest layoutParsingRequest, DocumentData documentData) throws IOException {
+    public void storeDocumentData(LayoutParsingRequest layoutParsingRequest, DocumentData documentData) {
 
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.structureFileStorageId(), documentData.getTableOfContents());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.textBlockFileStorageId(), documentData.getAtomicTextBlocks());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.positionBlockFileStorageId(), documentData.getAtomicPositionBlocks());
-        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.pageFileStorageId(), documentData.getPages());
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.structureFileStorageId(), documentData.getDocumentStructure());
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.textBlockFileStorageId(), documentData.getDocumentTextData());
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.positionBlockFileStorageId(), documentData.getDocumentPositions());
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.pageFileStorageId(), documentData.getDocumentPages());
+    }
 
+
+    public void storeSectionGrid(LayoutParsingRequest layoutParsingRequest, SectionGrid sectionGrid) {
+
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.sectionGridStorageId(), sectionGrid);
+    }
+
+
+    public void storeResearchDocumentData(LayoutParsingRequest layoutParsingRequest, ResearchDocumentData researchDocumentData) {
+
+        storageService.storeJSONObject(TenantContext.getTenantId(), layoutParsingRequest.researchDocumentStorageId(), researchDocumentData);
     }
 
 
     public DocumentData readDocumentData(LayoutParsingRequest layoutParsingRequest) throws IOException {
 
-        PageData[] pageData = storageService.readJSONObject(TenantContext.getTenantId(), layoutParsingRequest.pageFileStorageId(), PageData[].class);
-        AtomicTextBlockData[] atomicTextBlockData = storageService.readJSONObject(TenantContext.getTenantId(),
+        DocumentPage[] documentPageData = storageService.readJSONObject(TenantContext.getTenantId(), layoutParsingRequest.pageFileStorageId(), DocumentPage[].class);
+        DocumentTextData[] documentTextDataBlockData = storageService.readJSONObject(TenantContext.getTenantId(),
                 layoutParsingRequest.textBlockFileStorageId(),
-                AtomicTextBlockData[].class);
-        AtomicPositionBlockData[] atomicPositionBlockData = storageService.readJSONObject(TenantContext.getTenantId(),
+                DocumentTextData[].class);
+        DocumentPositionData[] atomicPositionBlockData = storageService.readJSONObject(TenantContext.getTenantId(),
                 layoutParsingRequest.positionBlockFileStorageId(),
-                AtomicPositionBlockData[].class);
-        TableOfContentsData tableOfContentsData = storageService.readJSONObject(TenantContext.getTenantId(),
-                layoutParsingRequest.structureFileStorageId(),
-                TableOfContentsData.class);
+                DocumentPositionData[].class);
+        DocumentStructure tableOfContentsData = storageService.readJSONObject(TenantContext.getTenantId(), layoutParsingRequest.structureFileStorageId(), DocumentStructure.class);
 
         return DocumentData.builder()
-                .tableOfContents(tableOfContentsData)
-                .atomicPositionBlocks(atomicPositionBlockData)
-                .atomicTextBlocks(atomicTextBlockData)
-                .pages(pageData)
+                .documentStructure(tableOfContentsData)
+                .documentPositions(atomicPositionBlockData)
+                .documentTextData(documentTextDataBlockData)
+                .documentPages(documentPageData)
                 .build();
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/CvTableParsingAdapter.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.CvParsedTableCell;
+import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableCells;
 import com.knecon.fforesight.service.layoutparser.processor.adapter.model.table.TableServiceResponse;
 
 import lombok.RequiredArgsConstructor;
@@ -19,9 +19,9 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class CvTableParsingAdapter {
 
-    public Map<Integer, List<com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.CvParsedTableCell>> buildCvParsedTablesPerPage(TableServiceResponse tableServiceResponse) {
+    public Map<Integer, List<TableCells>> buildCvParsedTablesPerPage(TableServiceResponse tableServiceResponse) {
 
-        Map<Integer, List<com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.CvParsedTableCell>> tableCells = new HashMap<>();
+        Map<Integer, List<TableCells>> tableCells = new HashMap<>();
         tableServiceResponse.getData()
                 .forEach(tableData -> tableCells.computeIfAbsent(tableData.getPageInfo().getNumber(), tableCell -> new ArrayList<>())
                         .addAll(convertTableCells(tableData.getTableCells())));
@@ -30,11 +30,11 @@ public class CvTableParsingAdapter {
     }
 
 
-    private Collection<? extends com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.CvParsedTableCell> convertTableCells(List<CvParsedTableCell> tableCells) {
+    private Collection<TableCells> convertTableCells(List<TableCells> tableCells) {
 
-        List<com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.CvParsedTableCell> cvParsedTableCells = new ArrayList<>();
+        List<TableCells> cvParsedTableCells = new ArrayList<>();
 
-        tableCells.forEach(t -> cvParsedTableCells.add(com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.CvParsedTableCell.builder()
+        tableCells.forEach(t -> cvParsedTableCells.add(TableCells.builder()
                 .y0(t.getY0())
                 .x1(t.getX1())
                 .y1(t.getY1())

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/ImageServiceResponseAdapter.java

@@ -9,10 +9,10 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageType;
 import com.knecon.fforesight.service.layoutparser.processor.adapter.model.image.ImageServiceResponse;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.ClassificationPage;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.image.ClassifiedImage;
+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 lombok.RequiredArgsConstructor;
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Classification.java

@@ -3,12 +3,9 @@ package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image
 import java.util.HashMap;
 import java.util.Map;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class Classification {
 
     private Map<String, Float> probabilities = new HashMap<>();

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/FilterGeometry.java

@@ -1,14 +1,11 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class FilterGeometry {
 
     private ImageSize imageSize;
-    private Format imageFormat;
+    private ImageFormat imageFormat;
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Filters.java

@@ -1,11 +1,8 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class Filters {
 
     private FilterGeometry geometry;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Geometry.java

@@ -1,11 +1,8 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class Geometry {
 
     private float width;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageFormat.java

@@ -1,12 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
-public class Format {
+public class ImageFormat {
 
     private float quotient;
     private boolean tooTall;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageMetadata.java

@@ -1,12 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
-public class Metadata {
+public class ImageMetadata {
 
     private Classification classification;
     private Position position;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageServiceResponse.java

@@ -3,15 +3,12 @@ package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image
 import java.util.ArrayList;
 import java.util.List;
 
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class ImageServiceResponse {
 
     private String dossierId;
@@ -19,15 +16,13 @@ public class ImageServiceResponse {
 
     @JsonProperty(value = "imageMetadata")
     @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    private List<Metadata> data = new ArrayList<>();
+    private List<ImageMetadata> data = new ArrayList<>();
 
-    private List<Metadata> dataCV = new ArrayList<>();
+    private List<ImageMetadata> dataCV = new ArrayList<>();
 
 
     @JsonProperty(value = "imageMetadata")
     @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    public void setData(List<Metadata> data) {this.data = data;}
+    public void setData(List<ImageMetadata> data) {this.data = data;}
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/ImageSize.java

@@ -1,11 +1,8 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class ImageSize {
 
     private float quotient;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Position.java

@@ -1,11 +1,8 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class Position {
 
     private float x1;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/image/Probability.java

@@ -1,11 +1,8 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.image;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class Probability {
 
     private boolean unconfident;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/CvParsedTableModel.java

@@ -1,17 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dslplatform.json.CompiledJson;
-
-import lombok.Data;
-
-@Data
-@CompiledJson
-public class CvParsedTableModel {
-
-    private CvParsedPageInfo pageInfo;
-    private List<CvParsedTableCell> tableCells = new ArrayList<>();
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PageInfo.java

@@ -1,12 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
-public class CvParsedPageInfo {
+public class PageInfo {
 
     private int number;
     private int rotation;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/PdfTableCell.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto.table;
+package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 @Builder
 @AllArgsConstructor
 @RequiredArgsConstructor
-public class CvParsedTableCell {
+public class PdfTableCell {
 
     private float x0;
     private float y0;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableCells.java

@@ -1,12 +1,11 @@
 package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table;
 
-import com.dslplatform.json.CompiledJson;
-
+import lombok.Builder;
 import lombok.Data;
 
 @Data
-@CompiledJson
-public class CvParsedTableCell {
+@Builder
+public class TableCells {
 
     private float x0;
     private float y0;

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableData.java

@@ -0,0 +1,14 @@
+package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class TableData {
+
+    private PageInfo pageInfo;
+    private List<TableCells> tableCells = new ArrayList<>();
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/adapter/model/table/TableServiceResponse.java

@@ -3,12 +3,9 @@ package com.knecon.fforesight.service.layoutparser.processor.adapter.model.table
 import java.util.ArrayList;
 import java.util.List;
 
-import com.dslplatform.json.CompiledJson;
-
 import lombok.Data;
 
 @Data
-@CompiledJson
 public class TableServiceResponse {
 
     private String dossierId;
@@ -17,6 +14,6 @@ public class TableServiceResponse {
     private String targetFileExtension;
     private String responseFileExtension;
 
-    private List<CvParsedTableModel> data = new ArrayList<>();
+    private List<TableData> data = new ArrayList<>();
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/AbstractTextContainer.java

@@ -1,71 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto;
-
-import java.awt.geom.Rectangle2D;
-
-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextBlockOrientation;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public abstract class AbstractTextContainer {
-
-    protected float minX;
-    protected float maxX;
-    protected float minY;
-    protected float maxY;
-    protected String classification;
-    protected int page;
-
-    private TextBlockOrientation orientation = TextBlockOrientation.NONE;
-
-
-    public abstract String getText();
-
-
-    public boolean containsBlock(ClassificationTextBlock other) {
-
-        return this.minX <= other.getPdfMinX() && this.maxX >= other.getPdfMaxX() && this.minY >= other.getPdfMinY() && this.maxY <= other.getPdfMaxY();
-    }
-
-
-    public boolean contains(AbstractTextContainer other) {
-
-        return this.minX <= other.minX && this.maxX >= other.maxX && this.minY >= other.minY && this.maxY <= other.maxY;
-    }
-
-
-    public boolean contains(Rectangle2D other) {
-
-        return other.contains(minX, minY, getWidth(), getHeight());
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getHeight() {
-
-        return maxY - minY;
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getWidth() {
-
-        return maxX - minX;
-    }
-
-
-    public boolean intersectsY(AbstractTextContainer atc) {
-
-        return this.minY <= atc.getMaxY() && this.maxY >= atc.getMinY();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/ClassificationFooter.java

@@ -1,16 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto;
-
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class ClassificationFooter {
-
-    private List<ClassificationTextBlock> textBlocks;
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/ClassificationHeader.java

@@ -1,16 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto;
-
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class ClassificationHeader {
-
-    private List<ClassificationTextBlock> textBlocks;
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/ClassificationSection.java

@@ -1,38 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.image.ClassifiedImage;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.Table;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class ClassificationSection implements Comparable {
-
-    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
-    private List<ClassifiedImage> images = new ArrayList<>();
-    private String headline;
-
-
-    public List<Table> getTables() {
-
-        List<Table> tables = new ArrayList<>();
-        pageBlocks.forEach(block -> {
-            if (block instanceof Table) {
-                tables.add((Table) block);
-            }
-        });
-        return tables;
-    }
-
-
-    @Override
-    public int compareTo(Object o) {
-
-        return 0;
-    }
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/table/TableCell.java

@@ -1,38 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto.table;
-
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.Rectangle;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-@SuppressWarnings("serial")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-public class TableCell extends Rectangle {
-
-    private List<ClassificationTextBlock> textBlocks = new ArrayList<>();
-
-    private List<TableCell> headerCells = new ArrayList<>();
-
-    private boolean isHeaderCell;
-
-
-    public TableCell(Point2D topLeft, Point2D bottomRight) {
-
-        super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight.getY() - topLeft.getY()));
-    }
-
-
-    public void addTextBlock(ClassificationTextBlock textBlock) {
-
-        textBlocks.add(textBlock);
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/dto/text/TextBlockOrientation.java

@@ -1,8 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.dto.text;
-
-public enum TextBlockOrientation {
-
-    NONE,
-    LEFT,
-    RIGHT
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/classification/parsing/PDFAreaTextStripper.java

@@ -1,82 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.classification.parsing;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextPositionSequence;
-
-import lombok.Getter;
-import lombok.Setter;
-
-public class PDFAreaTextStripper extends PDFTextStripperByArea {
-
-    @Getter
-    private List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-
-    @Setter
-    private int pageNumber;
-
-
-    public PDFAreaTextStripper() throws IOException {
-
-    }
-
-
-    @Override
-    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
-
-        int startIndex = 0;
-        for (int i = 0; i <= textPositions.size() - 1; i++) {
-
-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
-                startIndex++;
-                continue;
-            }
-
-            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0")) && i <= textPositions.size() - 2) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i + 1;
-            }
-        }
-
-        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
-            sublist = sublist.subList(0, sublist.size() - 1);
-        }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-        }
-        super.writeString(text);
-    }
-
-
-    public void clearPositions() {
-
-        textPositionSequences = new ArrayList<>();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/DocumentGraphFactory.java

@@ -4,286 +4,125 @@ import static java.lang.String.format;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
 
-import java.util.Collections;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
 
-import org.springframework.stereotype.Service;
+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.ClassificationFooter;
+import com.knecon.fforesight.service.layoutparser.processor.model.ClassificationHeader;
+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.utils.IdBuilder;
+import com.knecon.fforesight.service.layoutparser.processor.utils.TextPositionOperations;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.DocumentGraph;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.TableOfContents;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.FooterNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.HeaderNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.HeadlineNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ImageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.NodeType;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.ParagraphNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SectionNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableCellNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.TableNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.TextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.AbstractTextContainer;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.ClassificationDocument;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.ClassificationFooter;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.ClassificationHeader;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.ClassificationPage;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.image.ClassifiedImage;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.Table;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.table.TableCell;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextPositionSequence;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
 
-
-@Service
+@UtilityClass
 public class DocumentGraphFactory {
 
-    public static final double TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD = 0.05;
+    public Document buildDocumentGraph(ClassificationDocument document) {
 
+        Document documentGraph = new Document();
+        Context context = new Context(documentGraph);
 
-    public DocumentGraph buildDocumentGraph(ClassificationDocument document) {
-
-        TextBlockFactory textBlockFactory = new TextBlockFactory();
-        DocumentGraph documentGraph = new DocumentGraph();
-        Context context = new Context(new TableOfContents(documentGraph), new HashMap<>(), new LinkedList<>(), new LinkedList<>(), textBlockFactory);
-
-        document.getPages().stream().map(this::buildPage).forEach(page -> context.pages().put(page, new AtomicInteger(1)));
-        document.getSections().stream().flatMap(section -> section.getImages().stream()).forEach(image -> context.images().add(image));
+        document.getPages().forEach(context::buildAndAddPageWithCounter);
+        document.getSections().stream().flatMap(section -> section.getImages().stream()).forEach(image -> context.getImages().add(image));
         addSections(document, context);
         addHeaderAndFooterToEachPage(document, context);
 
         documentGraph.setNumberOfPages(context.pages.size());
         documentGraph.setPages(context.pages.keySet());
-        documentGraph.setTableOfContents(context.tableOfContents);
-        documentGraph.setTextBlock(documentGraph.buildTextBlock());
+        documentGraph.setDocumentTree(context.documentTree);
+        documentGraph.setTextBlock(documentGraph.getTextBlock());
         return documentGraph;
     }
 
 
     private void addSections(ClassificationDocument document, Context context) {
 
-        document.getSections().forEach(section -> addSection(null, section.getPageBlocks(), section.getImages(), context));
+        document.getSections().forEach(section -> SectionNodeFactory.addSection(null, section.getPageBlocks(), section.getImages(), context));
     }
 
 
-    private void addSection(SemanticNode parentNode, List<AbstractTextContainer> pageBlocks, List<ClassifiedImage> images, Context context) {
+    public void addParagraphOrHeadline(GenericSemanticNode parentNode, TextPageBlock originalTextBlock, Context context, List<TextPageBlock> textBlocksToMerge) {
 
-        Map<Integer, List<AbstractTextContainer>> blocksPerPage = pageBlocks.stream().collect(groupingBy(AbstractTextContainer::getPage));
-        SectionNode sectionNode = SectionNode.builder().entities(new HashSet<>()).tableOfContents(context.tableOfContents()).build();
+        Page page = context.getPage(originalTextBlock.getPage());
 
-        context.sections().add(sectionNode);
-        blocksPerPage.keySet().forEach(pageNumber -> addSectionNodeToPageNode(context, sectionNode, pageNumber));
-
-        List<Integer> tocId;
-        if (parentNode == null) {
-            tocId = context.tableOfContents.createNewMainEntryAndReturnId(NodeType.SECTION, sectionNode);
+        GenericSemanticNode node;
+        if (originalTextBlock.isHeadline()) {
+            node = Headline.builder().documentTree(context.getDocumentTree()).build();
         } else {
-            tocId = context.tableOfContents.createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.SECTION, sectionNode);
-        }
-        sectionNode.setTocId(tocId);
-        Set<AbstractTextContainer> alreadyMerged = new HashSet<>();
-        for (AbstractTextContainer abstractTextContainer : pageBlocks) {
-
-            if (alreadyMerged.contains(abstractTextContainer)) {
-                continue;
-            }
-
-            if (abstractTextContainer instanceof ClassificationTextBlock) {
-                List<ClassificationTextBlock> textBlocks = findTextBlocksWithSameClassificationAndAlignsY(abstractTextContainer, pageBlocks);
-                alreadyMerged.addAll(textBlocks);
-                addParagraphOrHeadline(sectionNode, (ClassificationTextBlock) abstractTextContainer, context, textBlocks);
-            }
-            if (abstractTextContainer instanceof Table) {
-                addTable(sectionNode, (Table) abstractTextContainer, context);
-            }
-        }
-        for (ClassifiedImage image : images) {
-
-            addImage(sectionNode, image, context);
-        }
-    }
-
-
-    private static List<ClassificationTextBlock> findTextBlocksWithSameClassificationAndAlignsY(AbstractTextContainer atc, List<AbstractTextContainer> pageBlocks) {
-
-        return pageBlocks.stream()
-                .filter(abstractTextContainer -> !abstractTextContainer.equals(atc))
-                .filter(abstractTextContainer -> abstractTextContainer.getPage() == atc.getPage())
-                .filter(abstractTextContainer -> abstractTextContainer instanceof ClassificationTextBlock)
-                .filter(abstractTextContainer -> abstractTextContainer.intersectsY(atc))
-                .map(abstractTextContainer -> (ClassificationTextBlock) abstractTextContainer)
-                .toList();
-    }
-
-
-    private void addSectionNodeToPageNode(Context context, SectionNode sectionNode, Integer pageNumber) {
-
-        PageNode page = getPage(pageNumber, context);
-        page.getMainBody().add(sectionNode);
-    }
-
-
-    private void addTable(SemanticNode parentNode, Table table, Context context) {
-
-        PageNode page = getPage(table.getPage(), context);
-        TableNode tableNode = TableNode.builder().tableOfContents(context.tableOfContents()).numberOfCols(table.getColCount()).numberOfRows(table.getRowCount()).build();
-
-        if (!page.getMainBody().contains(parentNode)) {
-            parentNode.getPages().add(page);
-        }
-
-        page.getMainBody().add(tableNode);
-
-        List<Integer> tocId = context.tableOfContents().createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.TABLE, tableNode);
-        tableNode.setTocId(tocId);
-
-        addTableCells(table.getRows(), tableNode, context, table.getPage());
-    }
-
-
-    private void addTableCells(List<List<TableCell>> rows, SemanticNode parentNode, Context context, int pageNumber) {
-
-        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
-            for (int colIndex = 0; colIndex < rows.get(rowIndex).size(); colIndex++) {
-                addTableCell(rows.get(rowIndex).get(colIndex), rowIndex, colIndex, parentNode, pageNumber, context);
-            }
-        }
-    }
-
-
-    private void addTableCell(TableCell cell, int rowIndex, int colIndex, SemanticNode parentNode, int pageNumber, Context context) {
-
-        PageNode page = getPage(pageNumber, context);
-        cell.getTextBlocks().stream().filter(tb -> tb.getPage() == 0).forEach(tb -> tb.setPage(pageNumber));
-
-        TableCellNode tableCellNode = TableCellNode.builder()
-                .tableOfContents(context.tableOfContents())
-                .row(rowIndex)
-                .col(colIndex)
-                .header(cell.isHeaderCell())
-                .bBox(cell.getBounds2D())
-                .build();
-        page.getMainBody().add(tableCellNode);
-
-        TextBlock textBlock;
-
-        List<Integer> tocId = context.tableOfContents().createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.TABLE_CELL, tableCellNode);
-        tableCellNode.setTocId(tocId);
-
-        if (cell.getTextBlocks().isEmpty()) {
-            tableCellNode.setTerminalTextBlock(context.textBlockFactory.emptyTextBlock(parentNode, context, page));
-            tableCellNode.setTerminal(true);
-
-        } else if (cell.getTextBlocks().size() == 1) {
-            textBlock = context.textBlockFactory().buildAtomicTextBlock(cell.getTextBlocks().get(0).getSequences(), tableCellNode, context, page);
-            tableCellNode.setTerminalTextBlock(textBlock);
-            tableCellNode.setTerminal(true);
-
-        } else if (firstTextBlockIsHeadline(cell)) {
-            addSection(tableCellNode, cell.getTextBlocks().stream().map(tb -> (AbstractTextContainer) tb).toList(), Collections.emptyList(), context);
-            tableCellNode.setTerminal(false);
-
-        } else if (cellAreaIsSmallerThanPageAreaTimesThreshold(cell, page)) {
-            List<TextPositionSequence> sequences = TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(cell.getTextBlocks());
-            textBlock = context.textBlockFactory().buildAtomicTextBlock(sequences, tableCellNode, context, page);
-            tableCellNode.setTerminalTextBlock(textBlock);
-            tableCellNode.setTerminal(true);
-
-        } else {
-            cell.getTextBlocks().forEach(tb -> addParagraphOrHeadline(tableCellNode, tb, context));
-            tableCellNode.setTerminal(false);
-        }
-
-    }
-
-
-    private static boolean cellAreaIsSmallerThanPageAreaTimesThreshold(TableCell cell, PageNode page) {
-
-        return cell.getArea() < TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD * page.getHeight() * page.getWidth();
-    }
-
-
-    private static boolean firstTextBlockIsHeadline(TableCell cell) {
-
-        String classification = cell.getTextBlocks().get(0).getClassification();
-        return classification != null && classification.startsWith("H");
-    }
-
-
-    private void addParagraphOrHeadline(SemanticNode parentNode, ClassificationTextBlock originalTextBlock, Context context) {
-
-        addParagraphOrHeadline(parentNode, originalTextBlock, context, Collections.emptyList());
-    }
-
-
-    private void addParagraphOrHeadline(SemanticNode parentNode, ClassificationTextBlock originalTextBlock, Context context, List<ClassificationTextBlock> textBlocksToMerge) {
-
-        PageNode page = getPage(originalTextBlock.getPage(), context);
-
-        SemanticNode node;
-        if (originalTextBlock.getClassification() != null && originalTextBlock.getClassification().startsWith("H")) {
-            node = HeadlineNode.builder().tableOfContents(context.tableOfContents()).build();
-        } else {
-            node = ParagraphNode.builder().tableOfContents(context.tableOfContents()).build();
+            node = Paragraph.builder().documentTree(context.getDocumentTree()).build();
         }
 
         page.getMainBody().add(node);
 
-        List<ClassificationTextBlock> textBlocks = new LinkedList<>(textBlocksToMerge);
+        List<TextPageBlock> textBlocks = new ArrayList<>();
         textBlocks.add(originalTextBlock);
+        textBlocks.addAll(textBlocksToMerge);
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks), node, context, page);
-
-        if (node instanceof HeadlineNode headlineNode) {
-            List<Integer> tocId = context.tableOfContents.createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.HEADLINE, node);
-            headlineNode.setTerminalTextBlock(textBlock);
-            headlineNode.setTocId(tocId);
-        }
-        if (node instanceof ParagraphNode paragraphNode) {
-            List<Integer> tocId = context.tableOfContents.createNewChildEntryAndReturnId(parentNode.getTocId(), NodeType.PARAGRAPH, node);
-            paragraphNode.setTerminalTextBlock(textBlock);
-            paragraphNode.setTocId(tocId);
-        }
+        List<Integer> treeId = context.documentTree.createNewChildEntryAndReturnId(parentNode, node);
+        node.setLeafTextBlock(textBlock);
+        node.setTreeId(treeId);
     }
 
 
-    private void addImage(SectionNode sectionNode, ClassifiedImage image, Context context) {
+    public void addImage(Section section, ClassifiedImage image, Context context) {
 
-        PageNode page = getPage(image.getPage(), context);
-        ImageNode imageNode = ImageNode.builder()
+        Rectangle2D position = image.getPosition();
+        Page page = context.getPage(image.getPage());
+        Image imageNode = Image.builder()
+                .id(IdBuilder.buildId(Set.of(page), List.of(position)))
                 .imageType(image.getImageType())
-                .position(image.getPosition())
-                .transparency(image.isHasTransparency())
+                .position(position)
+                .transparent(image.isHasTransparency())
                 .page(page)
-                .tableOfContents(context.tableOfContents())
+                .documentTree(context.getDocumentTree())
                 .build();
         page.getMainBody().add(imageNode);
 
-        List<Integer> tocId = context.tableOfContents().createNewChildEntryAndReturnId(sectionNode.getTocId(), NodeType.IMAGE, imageNode);
-        imageNode.setTocId(tocId);
+        List<Integer> tocId = context.getDocumentTree().createNewChildEntryAndReturnId(section, imageNode);
+        imageNode.setTreeId(tocId);
     }
 
 
     private void addHeaderAndFooterToEachPage(ClassificationDocument document, Context context) {
 
-        Map<Integer, List<ClassificationTextBlock>> headers = document.getHeaders()
+        Map<Integer, List<TextPageBlock>> headers = document.getHeaders()
                 .stream()
                 .map(ClassificationHeader::getTextBlocks)
                 .flatMap(List::stream)
-                .collect(groupingBy(AbstractTextContainer::getPage, toList()));
+                .collect(groupingBy(AbstractPageBlock::getPage, toList()));
 
-        Map<Integer, List<ClassificationTextBlock>> footers = document.getFooters()
+        Map<Integer, List<TextPageBlock>> footers = document.getFooters()
                 .stream()
                 .map(ClassificationFooter::getTextBlocks)
                 .flatMap(List::stream)
-                .collect(groupingBy(AbstractTextContainer::getPage, toList()));
+                .collect(groupingBy(AbstractPageBlock::getPage, toList()));
 
         for (int pageIndex = 1; pageIndex <= document.getPages().size(); pageIndex++) {
             if (headers.containsKey(pageIndex)) {
@@ -303,85 +142,105 @@ public class DocumentGraphFactory {
     }
 
 
-    private void addFooter(List<ClassificationTextBlock> textBlocks, Context context) {
+    private void addFooter(List<TextPageBlock> textBlocks, Context context) {
 
-        PageNode page = getPage(textBlocks.get(0).getPage(), context);
-        FooterNode footer = FooterNode.builder().tableOfContents(context.tableOfContents()).build();
+        Page page = context.getPage(textBlocks.get(0).getPage());
+        Footer footer = Footer.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks),
                 footer,
                 context,
                 page);
-        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
-        footer.setTocId(tocId);
-        footer.setTerminalTextBlock(textBlock);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(footer);
+        footer.setTreeId(tocId);
+        footer.setLeafTextBlock(textBlock);
         page.setFooter(footer);
     }
 
 
-    public void addHeader(List<ClassificationTextBlock> textBlocks, Context context) {
+    public void addHeader(List<TextPageBlock> textBlocks, Context context) {
 
-        PageNode page = getPage(textBlocks.get(0).getPage(), context);
-        HeaderNode header = HeaderNode.builder().tableOfContents(context.tableOfContents()).build();
-        AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks),
-                header,
-                context,
-                0,
-                page);
-        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.HEADER, header);
-        header.setTocId(tocId);
-        header.setTerminalTextBlock(textBlock);
+        Page page = context.getPage(textBlocks.get(0).getPage());
+        Header header = Header.builder().documentTree(context.getDocumentTree()).build();
+        AtomicTextBlock textBlock = context.textBlockFactory.buildAtomicTextBlock(TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(textBlocks), header, 0, page);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(header);
+        header.setTreeId(tocId);
+        header.setLeafTextBlock(textBlock);
         page.setHeader(header);
     }
 
 
     private void addEmptyFooter(int pageIndex, Context context) {
 
-        PageNode page = getPage(pageIndex, context);
-        FooterNode footer = FooterNode.builder().tableOfContents(context.tableOfContents()).build();
+        Page page = context.getPage(pageIndex);
+        Footer footer = Footer.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(footer, context, page);
-        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
-        footer.setTocId(tocId);
-        footer.setTerminalTextBlock(textBlock);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(footer);
+        footer.setTreeId(tocId);
+        footer.setLeafTextBlock(textBlock);
         page.setFooter(footer);
     }
 
 
     private void addEmptyHeader(int pageIndex, Context context) {
 
-        PageNode page = getPage(pageIndex, context);
-        HeaderNode header = HeaderNode.builder().tableOfContents(context.tableOfContents()).build();
+        Page page = context.getPage(pageIndex);
+        Header header = Header.builder().documentTree(context.getDocumentTree()).build();
         AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(header, 0, page);
-        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.HEADER, header);
-        header.setTocId(tocId);
-        header.setTerminalTextBlock(textBlock);
+        List<Integer> tocId = context.getDocumentTree().createNewMainEntryAndReturnId(header);
+        header.setTreeId(tocId);
+        header.setLeafTextBlock(textBlock);
         page.setHeader(header);
     }
 
 
-    private PageNode buildPage(ClassificationPage p) {
+    @Getter
+    @Builder
+    @AllArgsConstructor
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    public final class Context {
 
-        return PageNode.builder()
-                .height((int) p.getPageHeight())
-                .width((int) p.getPageWidth())
-                .number(p.getPageNumber())
-                .rotation(p.getRotation())
-                .mainBody(new LinkedList<>())
-                .build();
-    }
+        DocumentTree documentTree;
+        Map<Page, Integer> pages;
+        List<Section> sections;
+        List<ClassifiedImage> images;
+        TextBlockFactory textBlockFactory;
 
 
-    private PageNode getPage(int pageIndex, Context context) {
+        public Context(Document document) {
 
-        return context.pages.keySet()
-                .stream()
-                .filter(page -> page.getNumber() == pageIndex)
-                .findFirst()
-                .orElseThrow(() -> new NoSuchElementException(format("ClassificationPage with number %d not found", pageIndex)));
-    }
+            documentTree = new DocumentTree(document);
+            pages = new HashMap<>();
+            sections = new LinkedList<>();
+            images = new LinkedList<>();
+            textBlockFactory = new TextBlockFactory();
+        }
 
 
-    record Context(
-            TableOfContents tableOfContents, Map<PageNode, AtomicInteger> pages, List<SectionNode> sections, List<ClassifiedImage> images, TextBlockFactory textBlockFactory) {
+        public void buildAndAddPageWithCounter(ClassificationPage classificationPage) {
+
+            Page page = Page.fromClassificationPage(classificationPage);
+            //this counter counts the TextBlocks per page
+            //initial value is set to 1, because 0 is reserved for Header
+            pages.put(page, 1);
+        }
+
+
+        public int getAndIncrementTextBlockNumberOnPage(Page page) {
+
+            Integer textBlockNumberOnPage = pages.get(page);
+            pages.merge(page, 1, Integer::sum);
+            return textBlockNumberOnPage;
+        }
+
+
+        public Page getPage(int pageIndex) {
+
+            return pages.keySet()
+                    .stream()
+                    .filter(page -> page.getNumber() == pageIndex)
+                    .findFirst()
+                    .orElseThrow(() -> new NoSuchElementException(format("ClassificationPage with number %d not found", pageIndex)));
+        }
 
     }
 

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/RectangleTransformations.java

@@ -1,105 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.factory;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.AbstractTextContainer;
-
-public class RectangleTransformations {
-
-    public static Rectangle2D pad(Rectangle2D rectangle2D, int deltaX, int deltaY) {
-
-        return new Rectangle2D.Double(rectangle2D.getMinX() - deltaX, rectangle2D.getMinY() - deltaY, rectangle2D.getWidth() + 2 * deltaX, rectangle2D.getHeight() + 2 * deltaY);
-    }
-
-
-    public static Rectangle2D bBoxUnionAbstractTextContainer(List<AbstractTextContainer> abstractTextContainers) {
-
-        return abstractTextContainers.stream().map(RectangleTransformations::toRectangle2D).collect(new Rectangle2DUnion());
-    }
-
-    public static Rectangle2D rectangleUnion(List<Rectangle2D> rectangle2DList) {
-
-        return rectangle2DList.stream().collect(new Rectangle2DUnion());
-    }
-
-
-    public static Rectangle2D toRectangle2D(AbstractTextContainer abstractTextContainer) {
-
-        return new Rectangle2D.Float(abstractTextContainer.getMinX(), abstractTextContainer.getMinY(), abstractTextContainer.getWidth(), abstractTextContainer.getHeight());
-    }
-
-
-    public static Rectangle2D toRectangle2D(PDRectangle rectangle) {
-
-        return new Rectangle2D.Double(rectangle.getLowerLeftX(), rectangle.getLowerLeftY(), rectangle.getWidth(), rectangle.getHeight());
-    }
-
-
-    public static String toString(Rectangle2D rectangle2D) {
-
-        return format("%f,%f,%f,%f", rectangle2D.getX(), rectangle2D.getY(), rectangle2D.getWidth(), rectangle2D.getHeight());
-    }
-
-
-    public static Rectangle2D parseRectangle2D(String bBox) {
-
-        List<Float> floats = Arrays.stream(bBox.split(",")).map(Float::parseFloat).toList();
-        return new Rectangle2D.Float(floats.get(0), floats.get(1), floats.get(2), floats.get(3));
-    }
-
-
-    private static class Rectangle2DUnion implements Collector<Rectangle2D, Area, Rectangle2D> {
-
-        @Override
-        public Supplier<Area> supplier() {
-
-            return Area::new;
-        }
-
-
-        @Override
-        public BiConsumer<Area, Rectangle2D> accumulator() {
-
-            return (area, rectangle2D) -> area.add(new Area(rectangle2D));
-        }
-
-
-        @Override
-        public BinaryOperator<Area> combiner() {
-
-            return (area1, area2) -> {
-                area1.add(area2);
-                return area1;
-            };
-        }
-
-
-        @Override
-        public Function<Area, Rectangle2D> finisher() {
-
-            return Area::getBounds2D;
-        }
-
-
-        @Override
-        public Set<Characteristics> characteristics() {
-
-            return Set.of(Characteristics.CONCURRENT, Characteristics.UNORDERED);
-        }
-
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionDto.java

@@ -0,0 +1,37 @@
+package com.knecon.fforesight.service.layoutparser.processor.factory;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+import java.util.List;
+
+import com.knecon.fforesight.service.layoutparser.processor.graph.Boundary;
+
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Builder
+@Getter
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class SearchTextWithTextPositionDto {
+
+    String searchText;
+    List<Integer> lineBreaks;
+    List<Integer> stringIdxToPositionIdx;
+    List<Boundary> boldTextBoundaries;
+    List<Boundary> italicTextBoundaries;
+    List<Rectangle2D> positions;
+
+
+    public static SearchTextWithTextPositionDto empty() {
+
+        return SearchTextWithTextPositionDto.builder()
+                .searchText("")
+                .lineBreaks(Collections.emptyList())
+                .positions(Collections.emptyList())
+                .stringIdxToPositionIdx(Collections.emptyList())
+                .build();
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionFactory.java

@@ -5,35 +5,35 @@ import java.awt.geom.Rectangle2D;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.RedTextPosition;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextDirection;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextPositionSequence;
+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 lombok.experimental.UtilityClass;
+
+@UtilityClass
 public class SearchTextWithTextPositionFactory {
 
-    public static final int HEIGHT_PADDING = 2;
+    public final int HEIGHT_PADDING = 2;
+    // when checking for a hyphen linebreak, we need to check after a linebreak if the last hyphen was less than three symbols away.
+    // We detect a linebreak as either a "\n" character or if two adjacent symbol's position differ in y-coordinates by at least one character height.
+    // If there is a hyphen linebreak, the hyphen will be 1 position in front of a "\n" or 2 positions in front of the character which has a lower y-coordinate
+    // This is why, we need to initialize this to < -2, otherwise, if the very first symbol is a \n we would detect a hyphen linebreak that isn't there.
+    // Also, Integer.MIN_VALUE is a bad idea due to potential overflow during arithmetic operations. This is why the default should be -3.
+    public final int MAX_HYPHEN_LINEBREAK_DISTANCE = 3;
 
 
-    public static SearchTextWithTextPositionModel buildSearchTextToTextPositionModel(List<TextPositionSequence> sequences) {
+    public SearchTextWithTextPositionDto buildSearchTextToTextPositionDto(List<TextPositionSequence> sequences) {
 
         if (sequences.isEmpty() || sequences.stream().allMatch(sequence -> sequence.getTextPositions().isEmpty())) {
-            return SearchTextWithTextPositionModel.builder()
-                    .searchText("")
-                    .lineBreaks(Collections.emptyList())
-                    .positions(Collections.emptyList())
-                    .stringCoordsToPositionCoords(Collections.emptyList())
-                    .build();
+            return SearchTextWithTextPositionDto.empty();
         }
 
-        List<Integer> stringIdxToPositionIdx = new LinkedList<>();
-        List<Integer> lineBreaksStringIdx = new LinkedList<>();
-        StringBuilder sb = new StringBuilder();
-
-        int stringIdx = 0;
-        int positionIdx = 0;
-        int lastHyphenIdx = -3;
+        Context context = new Context();
 
         RedTextPosition currentTextPosition = sequences.get(0).getTextPositions().get(0);
         RedTextPosition previousTextPosition = RedTextPosition.builder().unicode(" ").position(currentTextPosition.getPosition()).build();
@@ -42,60 +42,109 @@ public class SearchTextWithTextPositionFactory {
             for (int i = 0; i < word.getTextPositions().size(); ++i) {
 
                 currentTextPosition = word.getTextPositions().get(i);
-
                 if (isLineBreak(currentTextPosition, previousTextPosition)) {
-
-                    if (stringIdx - lastHyphenIdx < 3) {
-                        sb.delete(lastHyphenIdx, sb.length());
-                        stringIdxToPositionIdx = stringIdxToPositionIdx.subList(0, lastHyphenIdx);
-                        stringIdx = lastHyphenIdx;
-                        lastHyphenIdx = -3;
-                    }
-                    lineBreaksStringIdx.add(stringIdx);
+                    removeHyphenLinebreaks(context);
+                    context.lineBreaksStringIdx.add(context.stringIdx);
                 }
                 if (!isRepeatedWhitespace(currentTextPosition.getUnicode(), previousTextPosition.getUnicode())) {
-
                     if (isHyphen(currentTextPosition.getUnicode())) {
-                        lastHyphenIdx = stringIdx;
+                        context.lastHyphenIdx = context.stringIdx;
                     }
-                    sb.append(currentTextPosition.getUnicode());
-                    stringIdxToPositionIdx.add(positionIdx);
-                    ++stringIdx;
+                    appendCurrentTextPosition(context, currentTextPosition);
                 }
 
                 previousTextPosition = currentTextPosition;
-
-                ++positionIdx;
+                ++context.positionIdx;
             }
 
             previousTextPosition = RedTextPosition.builder().unicode(" ").position(previousTextPosition.getPosition()).build();
-            sb.append(previousTextPosition.getUnicode());
-            stringIdxToPositionIdx.add(positionIdx);
-            ++stringIdx;
+            context.stringBuilder.append(" ");
+            context.stringIdxToPositionIdx.add(context.positionIdx);
+            ++context.stringIdx;
         }
 
-        assert sb.length() == stringIdxToPositionIdx.size();
+        assert context.stringBuilder.length() == context.stringIdxToPositionIdx.size();
 
         List<Rectangle2D> positions = sequences.stream()
                 .flatMap(sequence -> sequence.getTextPositions().stream().map(textPosition -> mapRedTextPositionToInitialUserSpace(textPosition, sequence)))
                 .toList();
 
-        return SearchTextWithTextPositionModel.builder()
-                .searchText(sb.toString())
-                .lineBreaks(lineBreaksStringIdx)
-                .stringCoordsToPositionCoords(stringIdxToPositionIdx)
+        return SearchTextWithTextPositionDto.builder()
+                .searchText(context.stringBuilder.toString())
+                .lineBreaks(context.lineBreaksStringIdx)
+                .stringIdxToPositionIdx(context.stringIdxToPositionIdx)
                 .positions(positions)
+                .boldTextBoundaries(mergeToBoundaries(context.boldTextsStringIdx))
+                .italicTextBoundaries(mergeToBoundaries(context.italicTextStringIdx))
                 .build();
     }
 
 
-    private static boolean isLineBreak(RedTextPosition currentTextPosition, RedTextPosition previousTextPosition) {
+    private void appendCurrentTextPosition(Context context, RedTextPosition currentTextPosition) {
+
+        context.stringBuilder.append(currentTextPosition.getUnicode());
+
+        // unicode characters with more than 16-bit encoding have a length > 1 in java strings
+        for (int j = 0; j < currentTextPosition.getUnicode().length(); j++) {
+            context.stringIdxToPositionIdx.add(context.positionIdx);
+            addTextPositionWithFontType(currentTextPosition, "bold", context.boldTextsStringIdx, context.stringIdx);
+            addTextPositionWithFontType(currentTextPosition, "italic", context.italicTextStringIdx, context.stringIdx);
+        }
+        context.stringIdx += currentTextPosition.getUnicode().length();
+    }
+
+
+    private void removeHyphenLinebreaks(Context context) {
+
+        if (lastHyphenDirectlyBeforeLineBreak(context)) {
+            context.stringBuilder.delete(context.lastHyphenIdx, context.stringBuilder.length());
+            context.stringIdxToPositionIdx = context.stringIdxToPositionIdx.subList(0, context.lastHyphenIdx);
+            context.stringIdx = context.lastHyphenIdx;
+            context.lastHyphenIdx = -MAX_HYPHEN_LINEBREAK_DISTANCE;
+        }
+    }
+
+
+    private boolean lastHyphenDirectlyBeforeLineBreak(Context context) {
+
+        return context.stringIdx - context.lastHyphenIdx < MAX_HYPHEN_LINEBREAK_DISTANCE;
+    }
+
+    private static List<Boundary> mergeToBoundaries(List<Integer> integers) {
+
+        if (integers.isEmpty()) {
+            return Collections.emptyList();
+        }
+        List<Boundary> boundaries = new LinkedList<>();
+        int start = integers.get(0);
+        int end = integers.get(0) + 1;
+        for (int current : integers) {
+            if (current > end + 1) {
+                boundaries.add(new Boundary(start, end));
+                start = current;
+            }
+            end = current + 1;
+        }
+        if (boundaries.isEmpty())
+            boundaries.add(new Boundary(start, end));
+        return boundaries;
+    }
+
+
+    private static void addTextPositionWithFontType(RedTextPosition currentTextPosition, String fontType, List<Integer> fontTypePositions, int stringIdx) {
+
+        if (currentTextPosition.getFontName().toLowerCase(Locale.ROOT).contains(fontType)) {
+            fontTypePositions.add(stringIdx);
+        }
+    }
+
+    private boolean isLineBreak(RedTextPosition currentTextPosition, RedTextPosition previousTextPosition) {
 
         return Objects.equals(currentTextPosition.getUnicode(), "\n") || isDeltaYLargerThanTextHeight(currentTextPosition, previousTextPosition);
     }
 
 
-    private static boolean isDeltaYLargerThanTextHeight(RedTextPosition currentPosition, RedTextPosition previousPosition) {
+    private boolean isDeltaYLargerThanTextHeight(RedTextPosition currentPosition, RedTextPosition previousPosition) {
 
         if (previousPosition == null) {
             return false;
@@ -106,13 +155,13 @@ public class SearchTextWithTextPositionFactory {
     }
 
 
-    private static boolean isRepeatedWhitespace(String currentUnicode, String previousUnicode) {
+    private boolean isRepeatedWhitespace(String currentUnicode, String previousUnicode) {
 
         return Objects.equals(previousUnicode, " ") && Objects.equals(currentUnicode, " ");
     }
 
 
-    private static boolean isHyphen(String unicodeCharacter) {
+    private boolean isHyphen(String unicodeCharacter) {
 
         return Objects.equals(unicodeCharacter, "-") || //
                 Objects.equals(unicodeCharacter, "~") || //
@@ -128,7 +177,7 @@ public class SearchTextWithTextPositionFactory {
     }
 
 
-    private static Rectangle2D mapRedTextPositionToInitialUserSpace(RedTextPosition textPosition, TextPositionSequence sequence) {
+    private Rectangle2D mapRedTextPositionToInitialUserSpace(RedTextPosition textPosition, TextPositionSequence sequence) {
 
         float textHeight = sequence.getTextHeight() + HEIGHT_PADDING;
         Rectangle2D rectangle2D = new Rectangle2D.Double(textPosition.getXDirAdj(),
@@ -153,4 +202,20 @@ public class SearchTextWithTextPositionFactory {
         return transform.createTransformedShape(rectangle2D).getBounds2D();
     }
 
+
+    private class Context {
+
+        List<Integer> stringIdxToPositionIdx = new LinkedList<>();
+        List<Integer> lineBreaksStringIdx = new LinkedList<>();
+        List<Integer> boldTextsStringIdx = new LinkedList<>();
+        List<Integer> italicTextStringIdx = new LinkedList<>();
+        StringBuilder stringBuilder = new StringBuilder();
+
+        int stringIdx;
+        int positionIdx;
+
+        int lastHyphenIdx = -MAX_HYPHEN_LINEBREAK_DISTANCE;
+
+    }
+
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SearchTextWithTextPositionModel.java

@@ -1,20 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.factory;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import lombok.AccessLevel;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Builder
-@Getter
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class SearchTextWithTextPositionModel {
-
-    String searchText;
-    List<Integer> lineBreaks;
-    List<Integer> stringCoordsToPositionCoords;
-    List<Rectangle2D> positions;
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/SectionNodeFactory.java

@@ -0,0 +1,184 @@
+package com.knecon.fforesight.service.layoutparser.processor.factory;
+
+import static java.lang.String.format;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.groupingBy;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+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.utils.TableMergingUtility;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class SectionNodeFactory {
+
+    public void addSection(GenericSemanticNode parentNode, List<AbstractPageBlock> pageBlocks, List<ClassifiedImage> images, DocumentGraphFactory.Context context) {
+
+        if (pageBlocks.isEmpty()) {
+            return;
+        }
+        Map<Integer, List<AbstractPageBlock>> blocksPerPage = pageBlocks.stream().collect(groupingBy(AbstractPageBlock::getPage));
+        Section section = Section.builder().documentTree(context.getDocumentTree()).build();
+
+        context.getSections().add(section);
+        blocksPerPage.keySet().forEach(pageNumber -> addSectionNodeToPageNode(context, section, pageNumber));
+
+        section.setTreeId(getTreeId(parentNode, context, section));
+
+        addFirstHeadlineDirectlyToSection(pageBlocks, context, section);
+        if (containsTablesAndTextBlocks(pageBlocks)) {
+            splitPageBlocksIntoSubSections(pageBlocks).forEach(subSectionPageBlocks -> addSection(section, subSectionPageBlocks, emptyList(), context));
+        } else {
+            addTablesAndParagraphsAndHeadlinesToSection(pageBlocks, context, section);
+        }
+
+        images.stream().distinct().forEach(image -> DocumentGraphFactory.addImage(section, image, context));
+    }
+
+
+    private List<Integer> getTreeId(GenericSemanticNode parentNode, DocumentGraphFactory.Context context, Section section) {
+
+        if (parentNode == null) {
+            return context.getDocumentTree().createNewMainEntryAndReturnId(section);
+        } else {
+            return context.getDocumentTree().createNewChildEntryAndReturnId(parentNode, section);
+        }
+    }
+
+
+    private void addFirstHeadlineDirectlyToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, Section section) {
+
+        if (pageBlocks.get(0).isHeadline()) {
+            addTablesAndParagraphsAndHeadlinesToSection(List.of(pageBlocks.get(0)), context, section);
+            pageBlocks.remove(0);
+        }
+    }
+
+
+    private void addTablesAndParagraphsAndHeadlinesToSection(List<AbstractPageBlock> pageBlocks, DocumentGraphFactory.Context context, Section section) {
+
+        Set<AbstractPageBlock> alreadyMerged = new HashSet<>();
+        List<AbstractPageBlock> remainingBlocks = new LinkedList<>(pageBlocks);
+        for (AbstractPageBlock abstractPageBlock : pageBlocks) {
+
+            if (alreadyMerged.contains(abstractPageBlock)) {
+                continue;
+            }
+
+            remainingBlocks.removeAll(alreadyMerged);
+
+            if (abstractPageBlock instanceof TextPageBlock) {
+                List<TextPageBlock> textBlocks = findTextBlocksWithSameClassificationAndAlignsY((TextPageBlock) abstractPageBlock, remainingBlocks);
+                alreadyMerged.addAll(textBlocks);
+                DocumentGraphFactory.addParagraphOrHeadline(section, (TextPageBlock) abstractPageBlock, context, textBlocks);
+            } else if (abstractPageBlock instanceof TablePageBlock tablePageBlock) {
+                List<TablePageBlock> tablesToMerge = TableMergingUtility.findConsecutiveTablesWithSameColCountAndSameHeaders(tablePageBlock, remainingBlocks);
+                alreadyMerged.addAll(tablesToMerge);
+                TableNodeFactory.addTable(section, tablesToMerge, context);
+            } else {
+                throw new RuntimeException(format("Unhandled AbstractPageBlockType %s!", abstractPageBlock.getClass()));
+            }
+        }
+    }
+
+
+    private boolean containsTablesAndTextBlocks(List<AbstractPageBlock> pageBlocks) {
+
+        return pageBlocks.stream().anyMatch(pageBlock -> pageBlock instanceof TablePageBlock) && pageBlocks.stream().anyMatch(pageBlock -> pageBlock instanceof TextPageBlock);
+    }
+
+
+    /**
+     * This function splits the list of PageBlocks around TablePageBlocks, such that SubSections can be created, that don't include tables.
+     * This is needed so we can execute rules on sections, that do not contain tables.
+     * See: <a href="https://knecon.atlassian.net/wiki/spaces/RED/pages/14765218/Document+Structure">document structure wiki</a>
+     *
+     * @param pageBlocks a List of AbstractPageBlocks, which have at least one TablePageBlock and one ClassificationTextBlock
+     * @return List of Lists of AbstractPageBlocks, which include either a single Headline ClassificationTextBlock and a TablePageBlock or only ClassificationTextBlocks.
+     */
+    private List<List<AbstractPageBlock>> splitPageBlocksIntoSubSections(List<AbstractPageBlock> pageBlocks) {
+
+        List<List<AbstractPageBlock>> splitList = splitIntoCoherentList(pageBlocks);
+        movePrecedingHeadlineToTableList(splitList);
+        return splitList.stream().filter(list -> !list.isEmpty()).toList();
+    }
+
+
+    private void movePrecedingHeadlineToTableList(List<List<AbstractPageBlock>> splitList) {
+
+        for (int i = 0; i < splitList.size(); i++) {
+            if (listIsTablesOnly(splitList.get(i)) && i > 0) {
+                List<AbstractPageBlock> previousList = splitList.get(i - 1);
+                AbstractPageBlock lastPageBlockInPreviousList = previousList.get(previousList.size() - 1);
+                if (lastPageBlockInPreviousList.isHeadline()) {
+                    previousList.remove(previousList.size() - 1);
+                    splitList.get(i).add(0, lastPageBlockInPreviousList);
+                }
+            }
+        }
+    }
+
+
+    private boolean listIsTablesOnly(List<AbstractPageBlock> abstractPageBlocks) {
+
+        return abstractPageBlocks.stream().allMatch(abstractPageBlock -> abstractPageBlock instanceof TablePageBlock);
+    }
+
+
+    /**
+     * @param pageBlocks a List of AbstractPageBlocks, which have at least one TablePageBlock and one ClassificationTextBlock
+     * @return List of Lists of AbstractPageBlocks, which are exclusively of type ClassificationTextBlock or TablePageBlock
+     */
+    private List<List<AbstractPageBlock>> splitIntoCoherentList(List<AbstractPageBlock> pageBlocks) {
+
+        List<List<AbstractPageBlock>> splitList = new LinkedList<>();
+        List<AbstractPageBlock> currentList = new LinkedList<>();
+        splitList.add(currentList);
+
+        Class<? extends AbstractPageBlock> lastPageBlockClass = pageBlocks.get(0).getClass();
+        for (AbstractPageBlock pageBlock : pageBlocks) {
+            if (lastPageBlockClass.isInstance(pageBlock)) {
+                currentList.add(pageBlock);
+            } else {
+                currentList = new LinkedList<>();
+                currentList.add(pageBlock);
+                splitList.add(currentList);
+                lastPageBlockClass = pageBlock.getClass();
+            }
+        }
+        return splitList;
+    }
+
+
+    private List<TextPageBlock> findTextBlocksWithSameClassificationAndAlignsY(TextPageBlock atc, List<AbstractPageBlock> pageBlocks) {
+
+        return pageBlocks.stream()
+                .filter(abstractTextContainer -> !abstractTextContainer.equals(atc))
+                .filter(abstractTextContainer -> abstractTextContainer.getPage() == atc.getPage())
+                .filter(abstractTextContainer -> abstractTextContainer instanceof TextPageBlock)
+                .filter(abstractTextContainer -> abstractTextContainer.intersectsY(atc))
+                .map(abstractTextContainer -> (TextPageBlock) abstractTextContainer)
+                .filter(abstractTextContainer -> abstractTextContainer.getDir() == atc.getDir())
+                .toList();
+    }
+
+
+    private void addSectionNodeToPageNode(DocumentGraphFactory.Context context, Section section, Integer pageNumber) {
+
+        Page page = context.getPage(pageNumber);
+        page.getMainBody().add(section);
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TableNodeFactory.java

@@ -0,0 +1,136 @@
+package com.knecon.fforesight.service.layoutparser.processor.factory;
+
+import static java.util.Collections.emptyList;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.knecon.fforesight.service.layoutparser.processor.model.AbstractPageBlock;
+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.utils.TextPositionOperations;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class TableNodeFactory {
+
+    public final double TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD = 0.05;
+
+
+    public void addTable(GenericSemanticNode parentNode, List<TablePageBlock> tablesToMerge, DocumentGraphFactory.Context context) {
+
+        setPageNumberInCells(tablesToMerge);
+        Set<Page> pages = tablesToMerge.stream().map(AbstractPageBlock::getPage).map(context::getPage).collect(Collectors.toSet());
+        List<List<Cell>> mergedRows = tablesToMerge.stream().map(TablePageBlock::getRows).flatMap(Collection::stream).toList();
+        Table table = Table.builder().documentTree(context.getDocumentTree()).numberOfCols(mergedRows.get(0).size()).numberOfRows(mergedRows.size()).build();
+
+        pages.forEach(page -> addTableToPage(page, parentNode, table));
+
+        List<Integer> treeId = context.getDocumentTree().createNewChildEntryAndReturnId(parentNode, table);
+        table.setTreeId(treeId);
+        addTableCells(mergedRows, table, context);
+
+        ifTableHasNoHeadersSetFirstRowAsHeaders(table);
+    }
+
+
+    private void setPageNumberInCells(List<TablePageBlock> tablesToMerge) {
+
+        // For some reason I can't figure out, in some table cells, the ClassificationTextBlocks have 0 as page number
+        // So I am fixing this here, but this should actually be fixed upstream.
+        tablesToMerge.forEach(table -> table.getRows()
+                .stream()
+                .flatMap(Collection::stream)
+                .peek(cell -> cell.setPageNumber(table.getPage()))
+                .forEach(cell -> setPageNumberInTextBlocksWithPageNumberSetTo0(table, cell)));
+    }
+
+
+    private void setPageNumberInTextBlocksWithPageNumberSetTo0(TablePageBlock table, Cell cell) {
+
+        cell.getTextBlocks().stream()//
+                .filter(tb -> tb.getPage() == 0)//
+                .forEach(tb -> tb.setPage(table.getPage()));
+    }
+
+
+    @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
+    private void addTableToPage(Page page, SemanticNode parentNode, Table table) {
+
+        if (!page.getMainBody().contains(parentNode)) {
+            parentNode.getPages().add(page);
+        }
+
+        page.getMainBody().add(table);
+    }
+
+
+    private void ifTableHasNoHeadersSetFirstRowAsHeaders(Table table) {
+
+        if (table.streamHeaders().findAny().isEmpty()) {
+            table.streamRow(0).forEach(tableCellNode -> tableCellNode.setHeader(true));
+        }
+    }
+
+
+    private void addTableCells(List<List<Cell>> rows, Table table, DocumentGraphFactory.Context context) {
+
+        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
+            for (int colIndex = 0; colIndex < rows.get(rowIndex).size(); colIndex++) {
+                addTableCell(rows.get(rowIndex).get(colIndex), rowIndex, colIndex, table, context);
+            }
+        }
+    }
+
+
+    @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
+    private void addTableCell(Cell cell, int rowIndex, int colIndex, Table tableNode, DocumentGraphFactory.Context context) {
+
+        Page page = context.getPage(cell.getPageNumber());
+
+        TableCell tableCell = TableCell.builder().documentTree(context.getDocumentTree()).row(rowIndex).col(colIndex).header(cell.isHeaderCell()).bBox(cell.getBounds2D()).build();
+        page.getMainBody().add(tableCell);
+
+        List<Integer> treeId = context.getDocumentTree().createNewTableChildEntryAndReturnId(tableNode, tableCell);
+        tableCell.setTreeId(treeId);
+
+        TextBlock textBlock;
+        if (cell.getTextBlocks().isEmpty()) {
+            tableCell.setLeafTextBlock(context.getTextBlockFactory().emptyTextBlock(tableNode, context, page));
+        } else if (cell.getTextBlocks().size() == 1) {
+            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(cell.getTextBlocks().get(0).getSequences(), tableCell, context, page);
+            tableCell.setLeafTextBlock(textBlock);
+        } else if (firstTextBlockIsHeadline(cell)) {
+            SectionNodeFactory.addSection(tableCell, cell.getTextBlocks().stream().map(tb -> (AbstractPageBlock) tb).toList(), emptyList(), context);
+        } else if (cellAreaIsSmallerThanPageAreaTimesThreshold(cell, page)) {
+            List<TextPositionSequence> sequences = TextPositionOperations.mergeAndSortTextPositionSequenceByYThenX(cell.getTextBlocks());
+            textBlock = context.getTextBlockFactory().buildAtomicTextBlock(sequences, tableCell, context, page);
+            tableCell.setLeafTextBlock(textBlock);
+        } else {
+            cell.getTextBlocks().forEach(tb -> DocumentGraphFactory.addParagraphOrHeadline(tableCell, tb, context, emptyList()));
+        }
+    }
+
+
+    private boolean cellAreaIsSmallerThanPageAreaTimesThreshold(Cell cell, Page page) {
+
+        return cell.getArea() < TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD * page.getHeight() * page.getWidth();
+    }
+
+
+    private boolean firstTextBlockIsHeadline(Cell cell) {
+
+        return cell.getTextBlocks().get(0).isHeadline();
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TextBlockFactory.java

@@ -1,79 +1,74 @@
 package com.knecon.fforesight.service.layoutparser.processor.factory;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.Boundary;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.PageNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.nodes.SemanticNode;
-import com.knecon.fforesight.service.layoutparser.internal.api.graph.textblock.AtomicTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextPositionSequence;
+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 lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
 
+@FieldDefaults(level = AccessLevel.PRIVATE)
 public class TextBlockFactory {
 
-    AtomicInteger stringOffset;
-    AtomicLong textBlockIdx;
+    int stringOffset;
+    long textBlockIdx;
 
 
-    public TextBlockFactory() {
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, Page page) {
 
-        stringOffset = new AtomicInteger();
-        textBlockIdx = new AtomicLong();
+        Integer numberOnPage = context.getAndIncrementTextBlockNumberOnPage(page);
+        return buildAtomicTextBlock(sequences, parent, numberOnPage, page);
     }
 
 
-    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, PageNode page) {
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, Integer numberOnPage, Page page) {
 
-        Integer numberOnPage = context.pages().get(page).getAndIncrement();
-        return buildAtomicTextBlock(sequences, parent, context, numberOnPage, page);
+        SearchTextWithTextPositionDto searchTextWithTextPositionDto = SearchTextWithTextPositionFactory.buildSearchTextToTextPositionDto(sequences);
+        int offset = stringOffset;
+        stringOffset += searchTextWithTextPositionDto.getSearchText().length();
+        long idx = textBlockIdx;
+        textBlockIdx++;
+        String orientation;
+        int textDirection;
+        if (sequences.isEmpty()) {
+            orientation = null;
+            textDirection = 0;
+        } else {
+            orientation = sequences.get(0).getDir().toString();
+            textDirection = sequences.get(0).getRotation();
+        }
+        return AtomicTextBlock.fromSearchTextWithTextPosition(searchTextWithTextPositionDto.getSearchText(),
+                searchTextWithTextPositionDto.getLineBreaks(),
+                searchTextWithTextPositionDto.getBoldTextBoundaries(),
+                searchTextWithTextPositionDto.getItalicTextBoundaries(),
+                searchTextWithTextPositionDto.getPositions(),
+                searchTextWithTextPositionDto.getStringIdxToPositionIdx(),
+                idx,
+                parent,
+                numberOnPage,
+                page,
+                offset,
+                orientation,
+                textDirection);
     }
 
 
-    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences,
-                                                SemanticNode parent,
-                                                DocumentGraphFactory.Context context,
-                                                Integer numberOnPage,
-                                                PageNode page) {
+    public AtomicTextBlock emptyTextBlock(SemanticNode parent, DocumentGraphFactory.Context context, Page page) {
 
-        SearchTextWithTextPositionModel searchTextWithTextPositionModel = SearchTextWithTextPositionFactory.buildSearchTextToTextPositionModel(sequences);
-        int offset = stringOffset.getAndAdd(searchTextWithTextPositionModel.getSearchText().length());
-
-        return AtomicTextBlock.builder()
-                .id(textBlockIdx.getAndIncrement())
-                .parent(parent)
-                .searchText(searchTextWithTextPositionModel.getSearchText())
-                .numberOnPage(numberOnPage)
-                .page(page)
-                .lineBreaks(searchTextWithTextPositionModel.getLineBreaks())
-                .positions(searchTextWithTextPositionModel.getPositions())
-                .stringIdxToPositionIdx(searchTextWithTextPositionModel.getStringCoordsToPositionCoords())
-                .boundary(new Boundary(offset, offset + searchTextWithTextPositionModel.getSearchText().length()))
-                .build();
+        long idx = textBlockIdx;
+        textBlockIdx++;
+        return AtomicTextBlock.empty(idx, stringOffset, page, context.getAndIncrementTextBlockNumberOnPage(page), parent);
     }
 
 
-    public AtomicTextBlock emptyTextBlock(SemanticNode parent, DocumentGraphFactory.Context context, PageNode page) {
+    public AtomicTextBlock emptyTextBlock(SemanticNode parent, Integer numberOnPage, Page page) {
 
-        return emptyTextBlock(parent, context.pages().get(page).getAndIncrement(), page);
-    }
-
-
-    public AtomicTextBlock emptyTextBlock(SemanticNode parent, Integer numberOnPage, PageNode page) {
-
-        return AtomicTextBlock.builder()
-                .id(textBlockIdx.getAndIncrement())
-                .boundary(new Boundary(stringOffset.get(), stringOffset.get()))
-                .searchText("")
-                .lineBreaks(Collections.emptyList())
-                .page(page)
-                .numberOnPage(numberOnPage)
-                .stringIdxToPositionIdx(Collections.emptyList())
-                .positions(Collections.emptyList())
-                .parent(parent)
-                .build();
+        long idx = textBlockIdx;
+        textBlockIdx++;
+        return AtomicTextBlock.empty(idx, stringOffset, page, numberOnPage, parent);
     }
 
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/factory/TextPositionOperations.java

@@ -1,20 +0,0 @@
-package com.knecon.fforesight.service.layoutparser.processor.factory;
-
-import java.util.Comparator;
-import java.util.List;
-
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.ClassificationTextBlock;
-import com.knecon.fforesight.service.layoutparser.processor.classification.dto.text.TextPositionSequence;
-
-public class TextPositionOperations {
-
-    public static List<TextPositionSequence> mergeAndSortTextPositionSequenceByYThenX(List<ClassificationTextBlock> textBlocks) {
-
-        return textBlocks.stream()//
-                .flatMap(tb -> tb.getSequences().stream())//
-                .sorted(Comparator.comparingDouble(TextPositionSequence::getMaxYDirAdj)//
-                        .thenComparing(TextPositionSequence::getMaxXDirAdj))//
-                .toList();
-    }
-
-}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/Boundary.java

@@ -1,11 +1,17 @@
-package com.knecon.fforesight.service.layoutparser.internal.api.graph;
+package com.knecon.fforesight.service.layoutparser.processor.graph;
 
+import static java.lang.String.format;
+
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.IntStream;
 
+import lombok.EqualsAndHashCode;
 import lombok.Setter;
 
 @Setter
+@EqualsAndHashCode
 public class Boundary implements Comparable<Boundary> {
 
     private int start;
@@ -15,7 +21,7 @@ public class Boundary implements Comparable<Boundary> {
     public Boundary(int start, int end) {
 
         if (start > end) {
-            throw new IllegalArgumentException(String.format("start: %d > end: %d", start, end));
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
         }
         this.start = start;
         this.end = end;
@@ -55,7 +61,7 @@ public class Boundary implements Comparable<Boundary> {
     public boolean contains(int start, int end) {
 
         if (start > end) {
-            throw new IllegalArgumentException(String.format("start: %d > end: %d", start, end));
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
         }
         return this.start <= start && end <= this.end;
     }
@@ -64,7 +70,7 @@ public class Boundary implements Comparable<Boundary> {
     public boolean containedBy(int start, int end) {
 
         if (start > end) {
-            throw new IllegalArgumentException(String.format("start: %d > end: %d", start, end));
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
         }
         return start <= this.start && this.end <= end;
     }
@@ -78,14 +84,14 @@ public class Boundary implements Comparable<Boundary> {
 
     public boolean intersects(Boundary boundary) {
 
-        return contains(boundary.start()) || contains(boundary.end() - 1);
+        return boundary.start() < this.end && this.start < boundary.end();
     }
 
 
     public List<Boundary> split(List<Integer> splitIndices) {
 
         if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
-            throw new IndexOutOfBoundsException(String.format("%s splitting indices are out of range for %s", splitIndices.stream().filter(idx -> !this.contains(idx)).toList(), this));
+            throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s", splitIndices.stream().filter(idx -> !this.contains(idx)).toList(), this));
         }
         List<Boundary> splitBoundaries = new LinkedList<>();
         int previousIndex = start;
@@ -102,8 +108,12 @@ public class Boundary implements Comparable<Boundary> {
         return splitBoundaries;
     }
 
+    public IntStream intStream() {
 
-    public static Boundary merge(List<Boundary> boundaries) {
+        return IntStream.range(start, end);
+    }
+
+    public static Boundary merge(Collection<Boundary> boundaries) {
 
         int minStart = boundaries.stream().mapToInt(Boundary::start).min().orElseThrow(IllegalArgumentException::new);
         int maxEnd = boundaries.stream().mapToInt(Boundary::end).max().orElseThrow(IllegalArgumentException::new);
@@ -114,7 +124,7 @@ public class Boundary implements Comparable<Boundary> {
     @Override
     public String toString() {
 
-        return String.format("Boundary [%d|%d)", start, end);
+        return format("Boundary [%d|%d)", start, end);
     }
 
 
@@ -131,18 +141,4 @@ public class Boundary implements Comparable<Boundary> {
         return 0;
     }
 
-
-    @Override
-    public int hashCode() {
-
-        return toString().hashCode();
-    }
-
-
-    @Override
-    public boolean equals(Object object) {
-
-        return hashCode() == object.hashCode();
-    }
-
 }

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/DocumentTree.java

@@ -0,0 +1,217 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph;
+
+import static java.lang.String.format;
+
+import java.util.Collections;
+import java.util.LinkedList;
+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 lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@EqualsAndHashCode
+public class DocumentTree {
+
+    private final Entry root;
+
+
+    public DocumentTree(Document document) {
+
+        root = Entry.builder().treeId(Collections.emptyList()).children(new LinkedList<>()).node(document).build();
+    }
+
+
+    public TextBlock buildTextBlock() {
+
+        return allEntriesInOrder().map(Entry::getNode).filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+    }
+
+
+    public List<Integer> createNewMainEntryAndReturnId(GenericSemanticNode node) {
+
+        return createNewChildEntryAndReturnIdImpl(Collections.emptyList(), node);
+    }
+
+
+    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, GenericSemanticNode node) {
+
+        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
+    }
+
+
+    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, Table node) {
+
+        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
+    }
+
+
+    public List<Integer> createNewTableChildEntryAndReturnId(Table parentTable, TableCell tableCell) {
+
+        return createNewChildEntryAndReturnIdImpl(parentTable.getTreeId(), tableCell);
+    }
+
+
+    @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
+    private List<Integer> createNewChildEntryAndReturnIdImpl(List<Integer> parentId, SemanticNode node) {
+
+        if (!entryExists(parentId)) {
+            throw new IllegalArgumentException(format("parentId %s does not exist!", parentId));
+        }
+
+        Entry parent = getEntryById(parentId);
+        List<Integer> newId = new LinkedList<>(parentId);
+        newId.add(parent.children.size());
+        parent.children.add(Entry.builder().treeId(newId).node(node).build());
+
+        return newId;
+    }
+
+
+    private boolean entryExists(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root != null;
+        }
+        Entry entry = root.children.get(treeId.get(0));
+        for (int id : treeId.subList(1, treeId.size())) {
+            if (id >= entry.children.size() || 0 > id) {
+                return false;
+            }
+            entry = entry.children.get(id);
+        }
+        return true;
+    }
+
+
+    public Entry getParentEntryById(List<Integer> treeId) {
+
+        return getEntryById(getParentId(treeId));
+    }
+
+
+    public boolean hasParentById(List<Integer> treeId) {
+
+        return !treeId.isEmpty();
+    }
+
+
+    public Stream<SemanticNode> childNodes(List<Integer> treeId) {
+
+        return getEntryById(treeId).children.stream().map(Entry::getNode);
+    }
+
+
+    public Stream<SemanticNode> childNodesOfType(List<Integer> treeId, NodeType nodeType) {
+
+        return getEntryById(treeId).children.stream().filter(entry -> entry.node.getType().equals(nodeType)).map(Entry::getNode);
+    }
+
+
+    private static List<Integer> getParentId(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            throw new UnsupportedOperationException("Root has no parent!");
+        }
+        if (treeId.size() < 2) {
+            return Collections.emptyList();
+        }
+        return treeId.subList(0, treeId.size() - 1);
+    }
+
+
+    public Entry getEntryById(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root;
+        }
+        Entry entry = root.children.get(treeId.get(0));
+        for (int id : treeId.subList(1, treeId.size())) {
+            entry = entry.children.get(id);
+        }
+        return entry;
+    }
+
+
+    public Stream<Entry> mainEntries() {
+
+        return root.children.stream();
+    }
+
+
+    public Stream<Entry> allEntriesInOrder() {
+
+        return Stream.of(root).flatMap(DocumentTree::flatten);
+    }
+
+
+    public Stream<Entry> allSubEntriesInOrder(List<Integer> parentId) {
+
+        return getEntryById(parentId).children.stream().flatMap(DocumentTree::flatten);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.join("\n", allEntriesInOrder().map(Entry::toString).toList());
+    }
+
+
+    private static Stream<Entry> flatten(Entry entry) {
+
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(DocumentTree::flatten));
+    }
+
+
+    public SemanticNode getHighestParentById(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root.node;
+        }
+        return root.children.get(treeId.get(0)).node;
+    }
+
+
+    @Builder
+    @Getter
+    @AllArgsConstructor
+    @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+    public static class Entry {
+
+        List<Integer> treeId;
+        SemanticNode node;
+        @Builder.Default
+        List<Entry> children = new LinkedList<>();
+
+
+        @Override
+        public String toString() {
+
+            return node.toString();
+        }
+
+
+        public NodeType getType() {
+
+            return node.getType();
+        }
+
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/EntityType.java

@@ -0,0 +1,8 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph.entity;
+
+public enum EntityType {
+    ENTITY,
+    RECOMMENDATION,
+    FALSE_POSITIVE,
+    FALSE_RECOMMENDATION
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionEntity.java

@@ -0,0 +1,228 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+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.utils.IdBuilder;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class RedactionEntity {
+
+    // initial values
+    @EqualsAndHashCode.Include
+    final Boundary boundary;
+    @EqualsAndHashCode.Include
+    final String type;
+    @EqualsAndHashCode.Include
+    final EntityType entityType;
+
+    // empty defaults
+    boolean redaction;
+    boolean removed;
+    boolean ignored;
+    boolean resized;
+    boolean skipRemoveEntitiesContainedInLarger;
+    boolean dictionaryEntry;
+    boolean dossierDictionaryEntry;
+    Set<Engine> engines;
+    Set<RedactionEntity> references;
+    @Builder.Default
+    Deque<Integer> matchedRules = new LinkedList<>();
+    String redactionReason;
+    String legalBasis;
+
+    // inferred on graph insertion
+    @EqualsAndHashCode.Include
+    String value;
+    String textBefore;
+    String textAfter;
+    @Builder.Default
+    Set<Page> pages = new HashSet<>();
+    List<RedactionPosition> redactionPositionsPerPage;
+    @Builder.Default
+    List<SemanticNode> intersectingNodes = new LinkedList<>();
+    SemanticNode deepestFullyContainingNode;
+
+
+    public static RedactionEntity initialEntityNode(Boundary boundary, String type, EntityType entityType) {
+
+        return RedactionEntity.builder().type(type).entityType(entityType).boundary(boundary).engines(new HashSet<>()).references(new HashSet<>()).build();
+    }
+
+
+    public boolean occursInNodeOfType(Class<? extends SemanticNode> clazz) {
+
+        return intersectingNodes.stream().anyMatch(clazz::isInstance);
+    }
+
+
+    public boolean occursInNode(SemanticNode semanticNode) {
+
+        return intersectingNodes.stream().anyMatch(node -> node.equals(semanticNode));
+    }
+
+
+    public boolean isType(String type) {
+
+        return this.type.equals(type);
+    }
+
+
+    public boolean isAnyType(List<String> types) {
+
+        return types.contains(type);
+    }
+
+
+    public void addIntersectingNode(SemanticNode containingNode) {
+
+        intersectingNodes.add(containingNode);
+    }
+
+
+    public void removeFromGraph() {
+
+        intersectingNodes.forEach(node -> node.getEntities().remove(this));
+        pages.forEach(page -> page.getEntities().remove(this));
+        intersectingNodes = new LinkedList<>();
+        deepestFullyContainingNode = null;
+        pages = new HashSet<>();
+        removed = true;
+        ignored = true;
+    }
+
+
+    public void addMatchedRule(int ruleNumber) {
+
+        matchedRules.add(ruleNumber);
+    }
+
+
+    public int getMatchedRule() {
+
+        if (matchedRules.isEmpty()) {
+            return 0;
+        }
+        return matchedRules.getLast();
+    }
+
+
+    public List<RedactionPosition> getRedactionPositionsPerPage() {
+
+        if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(boundary);
+
+            Page firstPage = rectanglesPerLinePerPage.keySet()
+                    .stream()
+                    .min(Comparator.comparingInt(Page::getNumber))
+                    .orElseThrow(() -> new RuntimeException("No Positions found on any page!"));
+            String id = IdBuilder.buildId(pages, rectanglesPerLinePerPage.values().stream().flatMap(Collection::stream).toList());
+            redactionPositionsPerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildRedactionPosition(firstPage, id, entry)).toList();
+        }
+        return redactionPositionsPerPage;
+    }
+
+
+    private static RedactionPosition buildRedactionPosition(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
+
+        if (entry.getKey().equals(firstPage)) {
+            return new RedactionPosition(id, entry.getKey(), entry.getValue());
+        } else {
+            return new RedactionPosition(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
+        }
+    }
+
+
+    public boolean containedBy(RedactionEntity redactionEntity) {
+
+        return this.boundary.containedBy(redactionEntity.getBoundary());
+    }
+
+
+    public boolean contains(RedactionEntity redactionEntity) {
+
+        return this.boundary.contains(redactionEntity.getBoundary());
+    }
+
+
+    public boolean intersects(RedactionEntity redactionEntity) {
+
+        return this.boundary.intersects(redactionEntity.getBoundary());
+    }
+
+
+    public void addEngine(Engine engine) {
+
+        engines.add(engine);
+    }
+
+
+    public void addEngines(Set<Engine> engines) {
+
+        this.engines.addAll(engines);
+    }
+
+
+    public void addReference(RedactionEntity reference) {
+
+        references.add(reference);
+    }
+
+
+    public void addReferences(List<RedactionEntity> references) {
+
+        this.references.addAll(references);
+    }
+
+
+    public boolean matchesAnnotationId(String manualRedactionId) {
+
+        return getRedactionPositionsPerPage().stream().anyMatch(entityPosition -> entityPosition.getId().equals(manualRedactionId));
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("Entity[\"");
+        sb.append(value);
+        sb.append("\", ");
+        sb.append(boundary);
+        sb.append(", pages[");
+        pages.forEach(page -> {
+            sb.append(page.getNumber());
+            sb.append(", ");
+        });
+        sb.delete(sb.length() - 2, sb.length());
+        sb.append("], type = \"");
+        sb.append(type);
+        sb.append("\", EntityType.");
+        sb.append(entityType);
+        sb.append("]");
+        return sb.toString();
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/entity/RedactionPosition.java

@@ -0,0 +1,24 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.util.List;
+
+import com.knecon.fforesight.service.layoutparser.processor.graph.nodes.Page;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class RedactionPosition {
+
+    final String id;
+    Page page;
+    // Each entry in this list corresponds to an entry in the redaction log, this means:
+    // An entity might be represented by multiple redaction log entries
+    List<Rectangle2D> rectanglePerLine;
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Document.java

@@ -0,0 +1,120 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph.nodes;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+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 lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Document implements GenericSemanticNode {
+
+    Set<Page> pages;
+    DocumentTree documentTree;
+    Integer numberOfPages;
+    TextBlock textBlock;
+    @Builder.Default
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.DOCUMENT;
+    }
+
+
+    public TextBlock getTextBlock() {
+
+        if (textBlock == null) {
+            textBlock = streamTerminalTextBlocksInOrder().collect(new TextBlockCollector());
+        }
+        return textBlock;
+    }
+
+
+    public List<Section> getMainSections() {
+
+        return streamChildrenOfType(NodeType.SECTION).map(node -> (Section) node).collect(Collectors.toList());
+    }
+
+
+    public Stream<TextBlock> streamTerminalTextBlocksInOrder() {
+
+        return streamAllNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock);
+    }
+
+
+    @Override
+    public List<Integer> getTreeId() {
+
+        return Collections.emptyList();
+    }
+
+
+    @Override
+    public void setTreeId(List<Integer> tocId) {
+
+        throw new UnsupportedOperationException("Document is always the root of the TablePageBlock of Contents");
+    }
+
+
+    @Override
+    public Headline getHeadline() {
+
+        return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node).findFirst().orElseThrow(() -> new NotFoundException("No Headlines found in this document!"));
+    }
+
+
+    private Stream<SemanticNode> streamAllNodes() {
+
+        return documentTree.allEntriesInOrder().map(DocumentTree.Entry::getNode);
+    }
+
+
+    public Stream<Image> streamAllImages() {
+
+        return streamAllSubNodesOfType(NodeType.IMAGE).map(node -> (Image) node);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return NodeType.DOCUMENT + ": " + this.getTextBlock().buildSummary();
+    }
+
+
+    @Override
+    public Map<Page, Rectangle2D> getBBox() {
+
+        Map<Page, Rectangle2D> bBox = new HashMap<>();
+        for (Page page : pages) {
+            bBox.put(page, new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()));
+        }
+        return bBox;
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Footer.java

@@ -0,0 +1,65 @@
+package com.knecon.fforesight.service.layoutparser.processor.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 lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Footer implements GenericSemanticNode {
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.FOOTER;
+    }
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.FOOTER + ": " + leafTextBlock.buildSummary();
+    }
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/GenericSemanticNode.java

@@ -0,0 +1,5 @@
+package com.knecon.fforesight.service.layoutparser.processor.graph.nodes;
+
+public interface GenericSemanticNode extends SemanticNode {
+
+}

layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/graph/nodes/Header.java

@@ -0,0 +1,65 @@
+package com.knecon.fforesight.service.layoutparser.processor.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 lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Header implements GenericSemanticNode {
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.HEADER;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.HEADER + ": " + leafTextBlock.buildSummary();
+    }
+
+}