RED-6369: Rules Refactor

* added id to ImageNode * added Manual Redaction Handling to Rules * minor rename
2023-04-19 13:52:27 +02:00 · 2023-04-17 18:44:16 +02:00 · 2023-04-17 18:17:01 +02:00 · 2023-04-17 16:34:08 +02:00 · 2023-04-17 13:25:45 +02:00 · 2023-04-17 12:54:17 +02:00
543 changed files with 3991754 additions and 4374 deletions
@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.

 ## [Unreleased]
@@ -1,37 +1,37 @@
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>

-  <parent>
-    <groupId>com.atlassian.bamboo</groupId>
-    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>com.atlassian.bamboo</groupId>
+        <artifactId>bamboo-specs-parent</artifactId>
+        <version>8.1.3</version>
+        <relativePath/>
+    </parent>

-  <artifactId>bamboo-specs</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+    <artifactId>bamboo-specs</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>

-  <dependencies>
-    <dependency>
-      <groupId>com.atlassian.bamboo</groupId>
-      <artifactId>bamboo-specs-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.atlassian.bamboo</groupId>
-      <artifactId>bamboo-specs</artifactId>
-    </dependency>
+    <dependencies>
+        <dependency>
+            <groupId>com.atlassian.bamboo</groupId>
+            <artifactId>bamboo-specs-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.atlassian.bamboo</groupId>
+            <artifactId>bamboo-specs</artifactId>
+        </dependency>

-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>


-  <!-- run 'mvn test' to perform offline validation of the plan -->
-  <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
+    <!-- run 'mvn test' to perform offline validation of the plan -->
+    <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
 </project>
@@ -2,8 +2,11 @@ package buildjob;

 import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;

+import java.time.LocalTime;
+
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
+import com.atlassian.bamboo.specs.api.builders.Variable;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
 import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
 import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
@@ -16,12 +19,15 @@ import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
 import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
 import com.atlassian.bamboo.specs.api.builders.project.Project;
 import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
+import com.atlassian.bamboo.specs.builders.task.CleanWorkingDirectoryTask;
 import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask;
 import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
 import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
+import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
 import com.atlassian.bamboo.specs.util.BambooServer;

 /**
@@ -33,12 +39,15 @@ public class PlanSpec {

    private static final String SERVICE_NAME = "redaction-service";

+    private static final String JVM_ARGS = " -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
+
    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");

+
    /**
     * Run main to publish plan on Bamboo
     */
-    public static void main(final String[] args) throws Exception {
+    public static void main(final String[] args) {
        //By default credentials are read from the '.credentials' file.
        BambooServer bambooServer = new BambooServer("http://localhost:8085");

@@ -46,92 +55,102 @@ public class PlanSpec {
        bambooServer.publish(plan);
        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
        bambooServer.publish(planPermission);
+
+        Plan nightPlan = new PlanSpec().createNightPlan();
+        bambooServer.publish(nightPlan);
+        PlanPermissions nightPlanPermission = new PlanSpec().createPlanPermission(nightPlan.getIdentifier());
+        bambooServer.publish(nightPlanPermission);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        bambooServer.publish(secPlan);
+        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
+        bambooServer.publish(secPlanPermission);
    }

+
    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
-        Permissions permission = new Permissions()
-                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+
+        Permissions permission = new Permissions().userPermissions("atlbamboo",
+                        PermissionType.EDIT,
+                        PermissionType.VIEW,
+                        PermissionType.ADMIN,
+                        PermissionType.CLONE,
+                        PermissionType.BUILD)
+                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
    }

+
    private Project project() {
-        return new Project()
-                .name("RED")
-                .key(new BambooKey("RED"));
+
+        return new Project().name("RED").key(new BambooKey("RED"));
    }

+
    public Plan createPlan() {
-        return new Plan(
-                project(),
-                SERVICE_NAME, new BambooKey(SERVICE_KEY))
-                .description("Plan created from (enter repository url of your plan)")
-                .stages(new Stage("Default Stage")
-                        .jobs(new Job("Default Job",
-                                new BambooKey("JOB1"))
-                                .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Build")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +

-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
-
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
-                                        createJUnitParserTask()
-                                                .description("Resultparser")
-                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                                .enabled(true),
-                                        new InjectVariablesTask()
-                                                .description("Inject git Tag")
-                                                .path("git.tag")
-                                                .namespace("g")
-                                                .scope(InjectVariablesScope.LOCAL),
-                                        new VcsTagTask()
-                                                .description("${bamboo.g.gitTag}")
-                                                .tagName("${bamboo.g.gitTag}")
-                                                .defaultRepository())
-                                .dockerConfiguration(
-                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
+        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Plan created from (enter repository url of your plan)")
+                .variables(new Variable("maven_add_param", ""))
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new CleanWorkingDirectoryTask().description("Clean working directory.")
+                                        .enabled(true),
+                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
+                                new ScriptTask().description("Build").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh").argument(SERVICE_NAME),
+                                createJUnitParserTask().description("Resultparser")
+                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                        .enabled(true),
+                                new InjectVariablesTask().description("Inject git Tag").path("git.tag").namespace("g").scope(InjectVariablesScope.LOCAL),
+                                new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository())
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
                .linkedRepositories("RED / " + SERVICE_NAME)
-
                .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranch()
-                        .delete(new BranchCleanup()
-                                .whenInactiveInRepositoryAfterDays(14))
+                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
+                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
+
+
+    public Plan createNightPlan() {
+
+        return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests")
+                .variables(new Variable("maven_add_param", "-Dtest-groups=rules-test"))
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new CleanWorkingDirectoryTask().description("Clean working directory.")
+                                        .enabled(true),
+                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
+                                new ScriptTask().description("Build")
+                                        .location(Location.FILE)
+                                        .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                        .argument(SERVICE_NAME + " verify"),
+                                createJUnitParserTask().description("Resultparser")
+                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                        .enabled(true))
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
+                .linkedRepositories("RED / " + SERVICE_NAME)
+                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
+                .planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters());
+    }
+
+
+    public Plan createSecBuild() {
+
+        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
+                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
+                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
+                                new ScriptTask().description("Sonar").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh").argument(SERVICE_NAME))
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .dockerRunArguments("--net=host")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
+                .linkedRepositories("RED / " + SERVICE_NAME)
+                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
+                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
+    }
+
 }
@@ -0,0 +1,65 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+MVN_TARGET=${2:-deploy}
+
+if [[ "$bamboo_planRepository_branchName" == "master" ]]
+then
+    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
+    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
+    newVersion="$(semver $latestVersion -p -i minor)"
+    echo "new release on master with version $newVersion"
+elif [[ "$bamboo_planRepository_branchName" == release* ]]
+then
+    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
+    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
+    newVersion="$(semver $latestVersion -p -i patch)"
+    echo "new release on $bamboo_planRepository_branchName with version $newVersion"
+elif [[ "${bamboo_version_tag}" != "dev" ]]
+then
+    newVersion="${bamboo_version_tag}"
+    echo "new special version bild with $newVersion"
+else
+    mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        --no-transfer-progress \
+        ${bamboo_maven_add_param} \
+        clean install \
+        -Djava.security.egd=file:/dev/./urandomelse
+    echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
+    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
+    exit 0
+fi
+
+echo "gitTag=${newVersion}" > git.tag
+
+mvn --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    ${bamboo_maven_add_param} \
+    versions:set \
+    -DnewVersion=${newVersion}
+
+mvn --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    ${bamboo_maven_add_param} \
+    versions:set  \
+    -DnewVersion=${newVersion}
+
+mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    --no-transfer-progress \
+    clean $MVN_TARGET \
+    ${bamboo_maven_add_param} \
+    -e \
+    -DdeployAtEnd=true \
+    -Dmaven.wagon.http.ssl.insecure=true \
+    -Dmaven.wagon.http.ssl.allowall=true \
+    -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
+    -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
+
+mvn --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    package
+
+mvn --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    docker:push
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+echo "build jar binaries"
+mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    --no-transfer-progress \
+    clean install \
+    -Djava.security.egd=file:/dev/./urandomelse
+
+echo "dependency-check:aggregate"
+mvn --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    org.owasp:dependency-check-maven:aggregate \
+    -DknownExploitedEnabled=false
+
+if [[ -z "${bamboo_repository_pr_key}" ]]
+then
+    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
+    mvn --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        sonar:sonar \
+        -Dsonar.projectKey=RED_$SERVICE_NAME \
+        -Dsonar.host.url=https://sonarqube.iqser.com \
+        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
+        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+else
+    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
+    mvn --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        sonar:sonar \
+        -Dsonar.projectKey=RED_$SERVICE_NAME \
+        -Dsonar.host.url=https://sonarqube.iqser.com \
+        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+        -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
+        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
+        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
+        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+fi
@@ -1,6 +1,5 @@
 package buildjob;

-
 import org.junit.Test;

 import com.atlassian.bamboo.specs.api.builders.plan.Plan;
@@ -8,10 +7,18 @@ import com.atlassian.bamboo.specs.api.exceptions.PropertiesValidationException;
 import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;

 public class PlanSpecTest {
+
    @Test
    public void checkYourPlanOffline() throws PropertiesValidationException {
-        Plan plan = new PlanSpec().createPlan();

+        Plan plan = new PlanSpec().createPlan();
        EntityPropertiesBuilders.build(plan);
+
+        Plan nightPlan = new PlanSpec().createNightPlan();
+        EntityPropertiesBuilders.build(nightPlan);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        EntityPropertiesBuilders.build(secPlan);
    }
+
 }
@@ -7,7 +7,7 @@

    <artifactId>redaction-service</artifactId>
    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>


    <packaging>pom</packaging>
@@ -18,4 +18,4 @@
        <module>redaction-service-image-v1</module>
    </modules>

-</project>
+</project>
@@ -5,7 +5,8 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.0.0</version>
+        <version>1.2.0</version>
+        <relativePath/>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -41,7 +42,7 @@
                <artifactId>docker-maven-plugin</artifactId>
            </plugin>
        </plugins>
-        
+
        <pluginManagement>
            <plugins>
                <plugin>
@@ -94,4 +95,4 @@
            </plugins>
        </pluginManagement>
    </build>
-</project>
+</project>
@@ -1,4 +1,4 @@
-FROM red/base-image:1.0.0
+FROM red/redaction-service-base-v1:2.0.0

 ARG PLATFORM_JAR

@@ -7,12 +7,3 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 ENV USES_ELASTICSEARCH false

 COPY ["${PLATFORM_JAR}", "/"]
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    wget cabextract xfonts-utils fonts-liberation \
- && rm -rf /var/lib/apt/lists/*
-
-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
@@ -5,14 +5,14 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.0.2</version>
+        <version>1.17.0</version>
+        <relativePath/>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>redaction-service-v1</artifactId>
    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-
+    <version>4.0-SNAPSHOT</version>

    <packaging>pom</packaging>

@@ -22,21 +22,20 @@
    </modules>

    <properties>
-        <pdfbox.version>2.0.21</pdfbox.version>
+        <pdfbox.version>2.0.24</pdfbox.version>
+        <dsljson.version>1.9.9</dsljson.version>
    </properties>


    <dependencyManagement>
-
        <dependencies>
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.1.0</version>
+                <version>1.22.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
-
            <dependency>
                <groupId>org.apache.pdfbox</groupId>
                <artifactId>pdfbox</artifactId>
@@ -47,9 +46,48 @@
                <artifactId>pdfbox-tools</artifactId>
                <version>${pdfbox.version}</version>
            </dependency>
-
        </dependencies>
-
    </dependencyManagement>

-</project>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <configuration>
+                        <format>ALL</format>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.8</version>
+                    <configuration>
+                        <excludes>
+                            <exclude>org/drools/**/*</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
@@ -6,16 +6,61 @@
    <parent>
        <artifactId>redaction-service-v1</artifactId>
        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
    </parent>

    <artifactId>redaction-service-api-v1</artifactId>

+    <properties>
+        <persistence-service.version>2.1.0</persistence-service.version>
+    </properties>
+
    <dependencies>
+
+        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
+        <dependency>
+            <groupId>com.dslplatform</groupId>
+            <artifactId>dsl-json-java8</artifactId>
+            <version>${dsljson.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
            <optional>true</optional>
        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>persistence-service-internal-api-v1</artifactId>
+            <version>${persistence-service.version}</version>
+            <exclusions>
+
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>persistence-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
@@ -5,11 +5,11 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
-@AllArgsConstructor
@NoArgsConstructor
-public class Point {
+@AllArgsConstructor
+public class Argument {

-    private float x;
-    private float y;
+    private String name;
+    private ArgumentType type;

 }
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ArgumentType {
+
+    INTEGER,
+    BOOLEAN,
+    STRING,
+    FILE_ATTRIBUTE,
+    REGEX,
+    TYPE,
+    RULE_NUMBER,
+    LEGAL_BASIS,
+    REFERENCE_TYPE
+
+}
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CellRectangle {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-
-}
@@ -1,19 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class IdRemoval {
-
-    private String id;
-    private String user;
-    private Status status;
-    private boolean removeFromDictionary;
-
-}
@@ -1,30 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactionEntry {
-
-    private String id;
-    private String user;
-    private String type;
-    private String value;
-    private String reason;
-    private String legalBasis;
-    private List<Rectangle> positions = new ArrayList<>();
-    private Status status;
-    private boolean addToDictionary;
-
-    private String section;
-    private int sectionNumber;
-
-}
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum ManualRedactionType {
-    ADD, REMOVE
-}
@@ -1,29 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactions {
-
-    @Builder.Default
-    private Set<IdRemoval> idsToRemove = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Rectangle {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-
-    private int page;
-}
@@ -1,29 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RedactionLog {
-
-    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion) {
-
-        this.redactionLogEntry = redactionLogEntry;
-        this.dictionaryVersion = dictionaryVersion;
-        this.rulesVersion = rulesVersion;
-    }
-
-    private List<RedactionLogEntry> redactionLogEntry;
-
-    private long dictionaryVersion = -1;
-
-    private long rulesVersion = -1;
-
-    private String filename;
-
-}
@@ -1,40 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionLogEntry {
-
-    private String id;
-    private String type;
-    private String value;
-    private String reason;
-    private int matchedRule;
-    private String legalBasis;
-    private boolean redacted;
-    private boolean isHint;
-    private boolean isRecommendation;
-    private String section;
-    private float[] color;
-
-    @Builder.Default
-    private List<Rectangle> positions = new ArrayList<>();
-    private int sectionNumber;
-    private boolean manual;
-    private Status status;
-    private ManualRedactionType manualRedactionType;
-    private boolean isDictionaryEntry;
-
-    private String textBefore;
-    private String textAfter;
-
-}
@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class RuleBuilderModel {
+
+    private List<RuleElement> whenClauses = new ArrayList<>();
+    private List<RuleElement> thenConditions = new ArrayList<>();
+
+}
@@ -1,18 +1,18 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SectionGrid {
+import java.util.ArrayList;
+import java.util.List;

-    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleElement {
+
+    private String conditionName;
+    private List<Argument> arguments = new ArrayList<>();

 }
@@ -1,33 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@RequiredArgsConstructor
-public class SectionRectangle {
-
-    @NonNull
-    private Point topLeft;
-
-    @NonNull
-    private float width;
-
-    @NonNull
-    private float height;
-
-    @NonNull
-    private int part;
-
-    @NonNull
-    private int numberOfParts;
-
-    private List<CellRectangle> tableCells;
-}
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}
@@ -9,9 +9,10 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class RedactionRequest {
+public class StructureAnalyzeRequest {
+
+    private String dossierId;
+    private String fileId;

-    private byte[] document;
-    private boolean flatRedaction;
-    private ManualRedactions manualRedactions;
 }
+
@@ -4,26 +4,9 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-
 public interface RedactionResource {

-    String SERVICE_NAME = "redaction-service-v1";
+    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
+    void testRules(@RequestBody String rules);

-    @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult sections(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/rules/update", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@RequestBody String rules);
-
-}
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.resources;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface RuleBuilderResource {
+
+    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
+    RuleBuilderModel getRuleBuilderModel();
+
+}
@@ -6,42 +6,81 @@
    <parent>
        <artifactId>redaction-service-v1</artifactId>
        <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
    </parent>

    <artifactId>redaction-service-server-v1</artifactId>

+    <properties>
+        <drools.version>7.73.0.Final</drools.version>
+        <kie.version>7.73.0.Final</kie.version>
+        <locationtech.version>1.18.2</locationtech.version>
+        <javaassist.version>3.28.0-GA</javaassist.version>
+        <ahocorasick.version>0.6.3</ahocorasick.version>
+        <jackson.version>2.13.2</jackson.version>
+    </properties>
+
    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>storage-commons</artifactId>
+        </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.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javaassist.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.3.7</version>
-        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${drools.version}</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${kie.version}</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
            <artifactId>jts-core</artifactId>
-            <version>1.16.1</version>
+            <version>${locationtech.version}</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
        </dependency>
+
        <!-- commons -->
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -54,12 +93,9 @@
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>metric-commons</artifactId>
+            <version>1.7.0</version>
        </dependency>
        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -73,11 +109,12 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
-        <!-- ribbon must be included because transitive a dependency on it.-->
+
        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
        </dependency>
+
        <!-- test dependencies -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -93,6 +130,18 @@

    <build>
        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+
            <plugin>
                <!-- generate git.properties for exposure in /info -->
                <groupId>pl.project13.maven</groupId>
@@ -1,18 +1,6 @@
 package com.iqser.red.service.redaction.v1.server;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -21,51 +9,32 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+import com.iqser.red.service.redaction.v1.server.multitenancy.AsyncConfig;
+import com.iqser.red.service.redaction.v1.server.multitenancy.MultiTenancyMessagingConfiguration;
+import com.iqser.red.service.redaction.v1.server.multitenancy.MultiTenancyWebConfiguration;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;

-@Import({DefaultWebMvcConfiguration.class})
+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;
+
+@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MultiTenancyMessagingConfiguration.class, MetricsConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, WebMvcMetricsAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
 public class Application {

-    @Autowired
-    private RulesClient rulesClient;
-
-
    public static void main(String[] args) {

+        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
        SpringApplication.run(Application.class, args);
    }


    @Bean
-    public KieContainer kieContainer() {
-
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            RulesResponse rules = rulesClient.getRules();
-            if (StringUtils.isEmpty(rules.getRules())) {
-                throw new RuntimeException("Rules cannot be empty.");
-            }
-            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
-                    .newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
+    public TimedAspect timedAspect(MeterRegistry registry) {

+        return new TimedAspect(registry);
    }

-}
+}
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.iqser.gin4.commons.metrics.MetricCommonsConfiguration;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerFactory;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
+
+@Configuration
+@Import({MetricCommonsConfiguration.class})
+public class MetricsConfiguration {
+
+    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
+
+
+    @Bean
+    @Qualifier(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME)
+    public FunctionTimerValues redactmanagerAnalyzePagewise(FunctionTimerFactory factory) {
+
+        return factory.create(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME);
+    }
+
+}
@@ -1,13 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;

 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,16 +14,18 @@ import lombok.NoArgsConstructor;
 public class Document {

    private List<Page> pages = new ArrayList<>();
-    private List<Paragraph> paragraphs = new ArrayList<>();
-    private Map<Integer, List<Entity>> entities = new HashMap<>();
+    private List<Section> sections = new ArrayList<>();
+    private List<Header> headers = new ArrayList<>();
+    private List<Footer> footers = new ArrayList<>();
+    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter= new FloatFrequencyCounter();
-    private StringFrequencyCounter fontCounter= new StringFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
    private boolean headlines;

-    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
-    private long dictionaryVersion;
+    private DictionaryVersion dictionaryVersion;
    private long rulesVersion;
+
 }
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -7,38 +9,39 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import lombok.Getter;
-
-public class FloatFrequencyCounter
-{
+public class FloatFrequencyCounter {

    @Getter
    Map<Float, Integer> countPerValue = new HashMap<>();

-    public void add(float value){
-        if(!countPerValue.containsKey(value)){
+
+    public void add(float value) {
+
+        if (!countPerValue.containsKey(value)) {
            countPerValue.put(value, 1);
        } else {
            countPerValue.put(value, countPerValue.get(value) + 1);
        }
    }

-    public void addAll(Map<Float, Integer> otherCounter){
-        for(Map.Entry<Float, Integer> entry: otherCounter.entrySet()){
-            if(countPerValue.containsKey(entry.getKey())){
-                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey())+ entry.getValue());
+
+    public void addAll(Map<Float, Integer> otherCounter) {
+
+        for (Map.Entry<Float, Integer> entry : otherCounter.entrySet()) {
+            if (countPerValue.containsKey(entry.getKey())) {
+                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
            } else {
                countPerValue.put(entry.getKey(), entry.getValue());
            }
        }
    }

-    public Float getMostPopular(){
+
+    public Float getMostPopular() {
+
        Map.Entry<Float, Integer> mostPopular = null;
-        for(Map.Entry<Float, Integer> entry: countPerValue.entrySet()){
-            if(mostPopular == null){
-                mostPopular = entry;
-            } else if(entry.getValue() >= mostPopular.getValue()){
+        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
                mostPopular = entry;
            }
        }
@@ -46,12 +49,12 @@ public class FloatFrequencyCounter
    }


+    public List<Float> getHighterThanMostPopular() {

-    public List<Float> getHighterThanMostPopular(){
        Float mostPopular = getMostPopular();
        List<Float> higher = new ArrayList<>();
-        for(Float value: countPerValue.keySet()){
-            if(value > mostPopular){
+        for (Float value : countPerValue.keySet()) {
+            if (value > mostPopular) {
                higher.add(value);
            }
        }
@@ -60,12 +63,11 @@ public class FloatFrequencyCounter
    }


-    public Float getHighest(){
+    public Float getHighest() {
+
        Float highest = null;
-        for(Float value: countPerValue.keySet()){
-            if (highest == null){
-                highest = value;
-            } else if(value > highest){
+        for (Float value : countPerValue.keySet()) {
+            if (highest == null || value > highest) {
                highest = value;
            }
        }
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class Footer {
+
+    private List<TextBlock> textBlocks;
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class Header {
+
+    private List<TextBlock> textBlocks;
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,8 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+public enum Orientation {
+
+    NONE,
+    LEFT,
+    RIGHT
+}
@@ -1,9 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.Data;
 import lombok.NonNull;
@@ -16,6 +18,8 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

+    private List<PdfImage> images = new ArrayList<>();
+
    private Rectangle bodyTextFrame;

    private boolean landscape;
@@ -28,8 +32,13 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

+    private float pageWidth;
+    private float pageHeight;
+
+
    public boolean isRotated() {
+
        return rotation != 0;
    }

-}
+}
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -12,9 +13,10 @@ import lombok.NoArgsConstructor;

@Data
@NoArgsConstructor
-public class Paragraph {
+public class Section implements Comparable {

    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
+    private List<PdfImage> images = new ArrayList<>();
    private String headline;


@@ -53,4 +55,10 @@ public class Paragraph {
        return textBlocks;
    }

-}
+
+    @Override
+    public int compareTo(Object o) {
+
+        return 0;
+    }
+}
@@ -0,0 +1,68 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionArea;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionText {
+
+    private int sectionNumber;
+    private String text;
+
+    private boolean isTable;
+    private String headline;
+
+    @Builder.Default
+    private List<SectionArea> sectionAreas = new ArrayList<>();
+    @Builder.Default
+    private Set<Image> images = new HashSet<>();
+    @Builder.Default
+    private List<TextBlock> textBlocks = new ArrayList<>();
+    @Builder.Default
+    private Map<String, CellValue> tabularData = new HashMap<>();
+    @Builder.Default
+    private List<Integer> cellStarts = new ArrayList<>();
+
+
+    public void setTabularData(Map<String, CellValue> tabularData) {
+
+        tabularData.remove(null);
+        this.tabularData = tabularData;
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block != null) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedSectionText {
+
+    private int sectionNumber;
+    private String text;
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedText {
+
+    private int numberOfPages;
+    private List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
+
+}
@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.Map;

-import lombok.Getter;
-
 public class StringFrequencyCounter {

    @Getter
@@ -37,13 +37,11 @@ public class StringFrequencyCounter {

        Map.Entry<String, Integer> mostPopular = null;
        for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null) {
-                mostPopular = entry;
-            } else if (entry.getValue() > mostPopular.getValue()) {
+            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
                mostPopular = entry;
            }
        }
        return mostPopular != null ? mostPopular.getKey() : null;
    }

-}
+}
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class Text {
+
+    private int numberOfPages;
+    private List<SectionText> sectionTexts = new ArrayList<>();
+
+}
@@ -3,34 +3,191 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import java.util.ArrayList;
 import java.util.List;

+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextDirection;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;

@AllArgsConstructor
@Builder
@Data
+@CompiledJson
+@NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {

    @Builder.Default
    private List<TextPositionSequence> sequences = new ArrayList<>();
+
+    @JsonIgnore
    private int rotation;

+    private int indexOnPage;
+
+    @JsonIgnore
    private String mostPopularWordFont;
+
+    @JsonIgnore
    private String mostPopularWordStyle;
+
+    @JsonIgnore
    private float mostPopularWordFontSize;
+
+    @JsonIgnore
    private float mostPopularWordHeight;
+
+    @JsonIgnore
    private float mostPopularWordSpaceWidth;

+    @JsonIgnore
    private float highestFontSize;

+    @JsonIgnore
    private String classification;

-    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public TextDirection getDir() {
+
+        return sequences.get(0).getDir();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private float getPageHeight() {
+
+        return sequences.get(0).getPageHeight();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private float getPageWidth() {
+
+        return sequences.get(0).getPageWidth();
+    }
+
+
+    /**
+     * Returns the minX value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the minX value in pdf coordinate system
+     */
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getPdfMinX() {
+
+        if (getDir().getDegrees() == 90) {
+            return minY;
+        } else if (getDir().getDegrees() == 180) {
+            return getPageWidth() - maxX;
+
+        } else if (getDir().getDegrees() == 270) {
+
+            return getPageWidth() - maxY;
+        } else {
+            return minX;
+        }
+    }
+
+    /**
+     * Returns the maxX value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the maxX value in pdf coordinate system
+     */
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getPdfMaxX() {
+
+        if (getDir().getDegrees() == 90) {
+            return maxY;
+        } else if (getDir().getDegrees() == 180) {
+            return getPageWidth() - minX;
+        } else if (getDir().getDegrees() == 270) {
+            return getPageWidth() - minY;
+
+        } else {
+            return maxX;
+        }
+    }
+
+
+    /**
+     * Returns the minY value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the minY value in pdf coordinate system
+     */
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getPdfMinY() {
+
+        if (getDir().getDegrees() == 90) {
+            return minX;
+        } else if (getDir().getDegrees() == 180) {
+            return maxY;
+
+        } else if (getDir().getDegrees() == 270) {
+            return getPageHeight() - maxX;
+
+        } else {
+            return getPageHeight() - maxY;
+        }
+    }
+
+
+    /**
+     * Returns the maxY value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the maxY value in pdf coordinate system
+     */
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getPdfMaxY() {
+
+        if (getDir().getDegrees() == 90) {
+            return maxX;
+        } else if (getDir().getDegrees() == 180) {
+
+            return minY;
+        } else if (getDir().getDegrees() == 270) {
+            return getPageHeight() - minX;
+        } else {
+            return getPageHeight() - minY;
+        }
+    }
+
+
+    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation, int indexOnPage) {
+        this.indexOnPage = indexOnPage;
        this.minX = minX;
        this.maxX = maxX;
        this.minY = minY;
@@ -39,19 +196,25 @@ public class TextBlock extends AbstractTextContainer {
        this.rotation = rotation;
    }

+
    public TextBlock union(TextPositionSequence r) {
+
        TextBlock union = this.copy();
        union.add(r);
        return union;
    }

+
    public TextBlock union(TextBlock r) {
+
        TextBlock union = this.copy();
        union.add(r);
        return union;
    }

+
    public void add(TextBlock r) {
+
        if (r.getMinX() < minX) {
            minX = r.getMinX();
        }
@@ -67,30 +230,38 @@ public class TextBlock extends AbstractTextContainer {
        sequences.addAll(r.getSequences());
    }

+
    public void add(TextPositionSequence r) {
-        if (r.getX1() < minX) {
-            minX = r.getX1();
+
+        if (r.getMinXDirAdj() < minX) {
+            minX = r.getMinXDirAdj();
        }
-        if (r.getX2() > maxX) {
-            maxX = r.getX2();
+        if (r.getMaxXDirAdj() > maxX) {
+            maxX = r.getMaxXDirAdj();
        }
-        if (r.getY1() < minY) {
-            minY = r.getY1();
+        if (r.getMinYDirAdj() < minY) {
+            minY = r.getMinYDirAdj();
        }
-        if (r.getY2() > maxY) {
-            maxY = r.getY2();
+        if (r.getMaxYDirAdj() > maxY) {
+            maxY = r.getMaxYDirAdj();
        }
    }

+
    public TextBlock copy() {
-        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation);
+
+        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation, indexOnPage);
    }

+
    public void resize(float x1, float y1, float width, float height) {
+
        set(x1, y1, x1 + width, y1 + height);
    }

+
    public void set(float x1, float y1, float x2, float y2) {
+
        this.minX = Math.min(x1, x2);
        this.maxX = Math.max(x1, x2);
        this.minY = Math.min(y1, y2);
@@ -98,7 +269,6 @@ public class TextBlock extends AbstractTextContainer {
    }


-
    @Override
    public String toString() {

@@ -117,7 +287,10 @@ public class TextBlock extends AbstractTextContainer {

    }

+
    @Override
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public String getText() {

        StringBuilder sb = new StringBuilder();
@@ -125,7 +298,7 @@ public class TextBlock extends AbstractTextContainer {
        TextPositionSequence previous = null;
        for (TextPositionSequence word : sequences) {
            if (previous != null) {
-                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -139,4 +312,4 @@ public class TextBlock extends AbstractTextContainer {

    }

-}
+}
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class UnclassifiedText {
+
+    private List<TextBlock> textBlocks;
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -1,49 +1,87 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

+import static java.util.stream.Collectors.toSet;
+
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;

 import org.springframework.stereotype.Service;

-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.RulingTextDirAdjustUtil;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

@Service
@SuppressWarnings("all")
 public class BlockificationService {

+    static final float THRESHOLD = 1f;
+
+
+    /**
+     * This method is building blocks by expanding the minX/maxX and minY/maxY value on each word that is not split by the conditions.
+     * This method must use text direction adjusted postions (DirAdj). Where {0,0} is on the upper left. Never try to change this!
+     * Rulings (Table lines) must be adjusted to the text directions as well, when checking if a block is split by a ruling.
+     *
+     * @param textPositions         The words of a page.
+     * @param horizontalRulingLines Horizontal table lines.
+     * @param verticalRulingLines   Vertical table lines.
+     * @return Page object that contains the Textblock and text statistics.
+     */
    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

+        int indexOnPage = 0;
        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();

        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
        TextPositionSequence prev = null;

+        boolean wasSplitted = false;
+        Float splitX1 = null;
        for (TextPositionSequence word : textPositions) {

-            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
-            boolean startFromTop = word.getY1() > maxY + word.getHeight();
+            boolean lineSeparation = word.getMinYDirAdj() - maxY > word.getHeight() * 1.25;
+            boolean startFromTop = prev != null && word.getMinYDirAdj() < prev.getMinYDirAdj() - prev.getTextHeight();
+            boolean splitByX = prev != null && maxX + 50 < word.getMinXDirAdj() && prev.getMinYDirAdj() == word.getMinYDirAdj();
+            boolean xIsBeforeFirstX = prev != null && word.getMinXDirAdj() < minX;
+            boolean newLineAfterSplit = prev != null && word.getMinYDirAdj() != prev.getMinYDirAdj() && wasSplitted && splitX1 != word.getMinXDirAdj();
+            boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);
+            boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir());

-            if (prev != null && (lineSeparation || startFromTop || word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), verticalRulingLines) || word.getRotation() == 0 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), verticalRulingLines))) {
+            if (prev != null && (lineSeparation || startFromTop || splitByX || splitByDir || isSplitByRuling)) {
+
+                Orientation prevOrientation = null;
+                if (!chunkBlockList1.isEmpty()) {
+                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
+                }
+
+                TextBlock cb1 = buildTextBlock(chunkWords, indexOnPage);
+                indexOnPage++;

-                TextBlock cb1 = buildTextBlock(chunkWords);
                chunkBlockList1.add(cb1);
                chunkWords = new ArrayList<>();

+                if (splitByX && !isSplitByRuling) {
+                    wasSplitted = true;
+                    cb1.setOrientation(Orientation.LEFT);
+                    splitX1 = word.getMinXDirAdj();
+                } else if (newLineAfterSplit && !isSplitByRuling) {
+                    wasSplitted = false;
+                    cb1.setOrientation(Orientation.RIGHT);
+                    splitX1 = null;
+                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !isSplitByRuling)) {
+                    cb1.setOrientation(Orientation.LEFT);
+                }
+
                minX = 1000;
                maxX = 0;
                minY = 1000;
@@ -54,30 +92,82 @@ public class BlockificationService {
            chunkWords.add(word);

            prev = word;
-            if (word.getX1() < minX) {
-                minX = word.getX1();
+            if (word.getMinXDirAdj() < minX) {
+                minX = word.getMinXDirAdj();
            }
-            if (word.getX2() > maxX) {
-                maxX = word.getX2();
+            if (word.getMaxXDirAdj() > maxX) {
+                maxX = word.getMaxXDirAdj();
            }
-            if (word.getY1() < minY) {
-                minY = word.getY1();
+            if (word.getMinYDirAdj() < minY) {
+                minY = word.getMinYDirAdj();
            }
-            if (word.getY2() > maxY) {
-                maxY = word.getY2();
+            if (word.getMaxYDirAdj() > maxY) {
+                maxY = word.getMaxYDirAdj();
            }
        }

-        TextBlock cb1 = buildTextBlock(chunkWords);
+        TextBlock cb1 = buildTextBlock(chunkWords, indexOnPage);
        if (cb1 != null) {
            chunkBlockList1.add(cb1);
        }

+        Iterator<AbstractTextContainer> itty = chunkBlockList1.iterator();
+
+        TextBlock previousLeft = null;
+        TextBlock previousRight = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()) {
+                    previousLeft.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()) {
+                    previousRight.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (block.getOrientation().equals(Orientation.LEFT)) {
+                previousLeft = block;
+            } else if (block.getOrientation().equals(Orientation.RIGHT)) {
+                previousRight = block;
+            }
+        }
+
+        itty = chunkBlockList1.iterator();
+        TextBlock previous = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(),
+                    previous.getMaxY()) || previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
+                previous.add(block);
+                itty.remove();
+                continue;
+            }
+
+            previous = block;
+        }
+
        return new Page(chunkBlockList1);
    }


-    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {
+    private boolean equalsWithThreshold(float f1, float f2) {
+
+        return Math.abs(f1 - f2) < THRESHOLD;
+    }
+
+
+    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList, int indexOnPage) {

        TextBlock textBlock = null;

@@ -96,12 +186,16 @@ public class BlockificationService {
            styleFrequencyCounter.add(wordBlock.getFontStyle());

            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getX1(), wordBlock.getX2(), wordBlock.getY1(), wordBlock.getY2(), wordBlockList, wordBlock
-                        .getRotation());
+                textBlock = new TextBlock(wordBlock.getMinXDirAdj(),
+                        wordBlock.getMaxXDirAdj(),
+                        wordBlock.getMinYDirAdj(),
+                        wordBlock.getMaxYDirAdj(),
+                        wordBlockList,
+                        wordBlock.getRotation(),
+                        indexOnPage);
            } else {
                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
-                        .getHeight());
+                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
            }
        }

@@ -114,14 +208,61 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

+        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences().stream().map(t -> round(t.getMinYDirAdj(), 3)).collect(toSet()).size() == 1) {
+            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getMinXDirAdj));
+        }
        return textBlock;
    }


-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {
+    private boolean isSplitByRuling(float minX,
+                                    float minY,
+                                    float maxX,
+                                    float maxY,
+                                    TextPositionSequence word,
+                                    List<Ruling> horizontalRulingLines,
+                                    List<Ruling> verticalRulingLines) {
+
+        return isSplitByRuling(maxX,
+                minY,
+                word.getMinXDirAdj(),
+                word.getMinYDirAdj(),
+                verticalRulingLines,
+                word.getDir().getDegrees(),
+                word.getPageWidth(),
+                word.getPageHeight()) //
+                || isSplitByRuling(minX,
+                minY,
+                word.getMinXDirAdj(),
+                word.getMaxYDirAdj(),
+                horizontalRulingLines,
+                word.getDir().getDegrees(),
+                word.getPageWidth(),
+                word.getPageHeight()) //
+                || isSplitByRuling(maxX,
+                minY,
+                word.getMinXDirAdj(),
+                word.getMinYDirAdj(),
+                horizontalRulingLines,
+                word.getDir().getDegrees(),
+                word.getPageWidth(),
+                word.getPageHeight()) //
+                || isSplitByRuling(minX,
+                minY,
+                word.getMinXDirAdj(),
+                word.getMaxYDirAdj(),
+                verticalRulingLines,
+                word.getDir().getDegrees(),
+                word.getPageWidth(),
+                word.getPageHeight()); //
+    }
+
+
+    private boolean isSplitByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines, float dir, float pageWidth, float pageHeight) {

        for (Ruling ruling : rulingLines) {
-            if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
+            var line = RulingTextDirAdjustUtil.convertToDirAdj(ruling, dir, pageWidth, pageHeight);
+            if (line.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
                return true;
            }
        }
@@ -129,81 +270,10 @@ public class BlockificationService {
    }


-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+    private double round(float value, int decimalPoints) {

-        float minX = 10000;
-        float maxX = -100;
-        float minY = 10000;
-        float maxY = -100;
-
-        for (Page page : pages) {
-
-            if (page.getTextBlocks().isEmpty() || landscape != page.isLandscape()) {
-                continue;
-            }
-
-            for (AbstractTextContainer container : page.getTextBlocks()) {
-
-                if (container instanceof TextBlock) {
-                    TextBlock textBlock = (TextBlock) container;
-                    if (textBlock.getMostPopularWordFont() == null || textBlock.getMostPopularWordStyle() == null) {
-                        continue;
-                    }
-
-                    float approxLineCount = PositionUtils.getApproxLineCount(textBlock);
-                    if (approxLineCount < 2.9f) {
-                        continue;
-                    }
-
-                    if (documentFontSizeCounter.getMostPopular() != null) {
-                        if (textBlock.getMostPopularWordFontSize() >= documentFontSizeCounter.getMostPopular()) {
-
-                            if (textBlock.getMinX() < minX) {
-                                minX = textBlock.getMinX();
-                            }
-                            if (textBlock.getMaxX() > maxX) {
-                                maxX = textBlock.getMaxX();
-                            }
-                            if (textBlock.getMinY() < minY) {
-                                minY = textBlock.getMinY();
-                            }
-                            if (textBlock.getMaxY() > maxY) {
-                                maxY = textBlock.getMaxY();
-                            }
-
-                        }
-                    }
-                }
-
-                if (container instanceof Table) {
-                    Table table = (Table) container;
-                    for (List<Cell> row : table.getRows()) {
-                        for (Cell cell : row) {
-
-                            if (cell == null || cell.getTextBlocks() == null) {
-                                continue;
-                            }
-                            for (TextBlock textBlock : cell.getTextBlocks()) {
-                                if (textBlock.getMinX() < minX) {
-                                    minX = textBlock.getMinX();
-                                }
-                                if (textBlock.getMaxX() > maxX) {
-                                    maxX = textBlock.getMaxX();
-                                }
-                                if (textBlock.getMinY() < minY) {
-                                    minY = textBlock.getMinY();
-                                }
-                                if (textBlock.getMaxY() > maxY) {
-                                    maxY = textBlock.getMaxY();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
+        var d = Math.pow(10, decimalPoints);
+        return Math.round(value * d) / d;
    }

 }
@@ -0,0 +1,161 @@
+package com.iqser.red.service.redaction.v1.server.classification.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
+@Service
+public class BodyTextFrameService {
+
+    /**
+     * Adjusts and sets the body text frame to a page.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     * The aspect ratio of the page is also regarded.
+     *
+     * @param page                   The page
+     * @param bodyTextFrame          frame that contains the main text on portrait pages
+     * @param landscapeBodyTextFrame frame that contains the main text on landscape pages
+     */
+    public void setBodyTextFrameAdjustedToPage(Page page, Rectangle bodyTextFrame, Rectangle landscapeBodyTextFrame) {
+
+        Rectangle textFrame = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
+
+        if (page.getPageWidth() > page.getPageHeight() && page.getRotation() == 270) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getY(), page.getPageHeight() - textFrame.getTopLeft().getX() - textFrame.getWidth()),
+                    textFrame.getHeight(),
+                    textFrame.getWidth(),
+                    0);
+        } else if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getY(), textFrame.getTopLeft().getX()), textFrame.getHeight(), textFrame.getWidth(), page.getPageNumber());
+        } else if (page.getRotation() == 180) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getX(), page.getPageHeight() - textFrame.getTopLeft().getY() - textFrame.getHeight()),
+                    textFrame.getWidth(),
+                    textFrame.getHeight(),
+                    0);
+        }
+        page.setBodyTextFrame(textFrame);
+    }
+
+
+    /**
+     * Calculates the frame that contains the main text, text outside the frame will be e.g. headers or footers.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     * The aspect ratio of the page is also regarded.
+     *
+     * @param pages                   List of all pages
+     * @param documentFontSizeCounter Statistics of the document
+     * @param landscape               Calculate for landscape or portrait
+     * @return Rectangle of the text frame
+     */
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+
+        BodyTextFrameExpansionsRectangle expansionsRectangle = new BodyTextFrameExpansionsRectangle();
+
+        for (Page page : pages) {
+
+            if (page.getTextBlocks().isEmpty() || landscape != page.isLandscape()) {
+                continue;
+            }
+
+            for (AbstractTextContainer container : page.getTextBlocks()) {
+
+                if (container instanceof TextBlock) {
+                    TextBlock textBlock = (TextBlock) container;
+                    if (textBlock.getMostPopularWordFont() == null || textBlock.getMostPopularWordStyle() == null) {
+                        continue;
+                    }
+
+                    float approxLineCount = PositionUtils.getApproxLineCount(textBlock);
+                    if (approxLineCount < 2.9f) {
+                        continue;
+                    }
+
+                    if (documentFontSizeCounter.getMostPopular() != null && textBlock.getMostPopularWordFontSize() >= documentFontSizeCounter.getMostPopular()) {
+
+                        expandRectangle(textBlock, page, expansionsRectangle);
+                    }
+                }
+
+                if (container instanceof Table) {
+                    Table table = (Table) container;
+                    for (List<Cell> row : table.getRows()) {
+                        for (Cell cell : row) {
+
+                            if (cell == null || cell.getTextBlocks() == null) {
+                                continue;
+                            }
+                            for (TextBlock textBlock : cell.getTextBlocks()) {
+                                expandRectangle(textBlock, page, expansionsRectangle);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return new Rectangle(new Point(expansionsRectangle.minX, expansionsRectangle.minY),
+                expansionsRectangle.maxX - expansionsRectangle.minX,
+                expansionsRectangle.maxY - expansionsRectangle.minY,
+                0);
+    }
+
+
+    private void expandRectangle(TextBlock textBlock, Page page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
+
+        if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
+            if (textBlock.getPdfMinY() < expansionsRectangle.minX) {
+                expansionsRectangle.minX = textBlock.getPdfMinY();
+            }
+            if (textBlock.getPdfMaxY() > expansionsRectangle.maxX) {
+                expansionsRectangle.maxX = textBlock.getPdfMaxY();
+            }
+            if (textBlock.getPdfMinX() < expansionsRectangle.minY) {
+                expansionsRectangle.minY = textBlock.getPdfMinX();
+            }
+            if (textBlock.getPdfMaxX() > expansionsRectangle.maxY) {
+                expansionsRectangle.maxY = textBlock.getPdfMaxX();
+            }
+        } else {
+            if (textBlock.getPdfMinX() < expansionsRectangle.minX) {
+                expansionsRectangle.minX = textBlock.getPdfMinX();
+            }
+            if (textBlock.getPdfMaxX() > expansionsRectangle.maxX) {
+                expansionsRectangle.maxX = textBlock.getPdfMaxX();
+            }
+            if (textBlock.getPdfMinY() < expansionsRectangle.minY) {
+                expansionsRectangle.minY = textBlock.getPdfMinY();
+            }
+            if (textBlock.getPdfMaxY() > expansionsRectangle.maxY) {
+                expansionsRectangle.maxY = textBlock.getPdfMaxY();
+            }
+        }
+    }
+
+
+    private class BodyTextFrameExpansionsRectangle {
+
+        float minX = 10000;
+        float maxX = -100;
+        float minY = 10000;
+        float maxY = -100;
+
+    }
+
+}
@@ -5,12 +5,12 @@ import java.util.regex.Pattern;

 import org.springframework.stereotype.Service;

+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,63 +20,63 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class ClassificationService {

-    private final BlockificationService blockificationService;
+    private final BodyTextFrameService bodyTextFrameService;


    public void classifyDocument(Document document) {

-        Rectangle bodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
-        Rectangle landscapeBodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
-
+        Rectangle bodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
+        Rectangle landscapeBodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
        List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();

        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());

        for (Page page : document.getPages()) {
-            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
-            page.setBodyTextFrame(btf);
-            classifyPage(btf, page, document, headlineFontSizes);
+            bodyTextFrameService.setBodyTextFrameAdjustedToPage(page, bodyTextFrame, landscapeBodyTextFrame);
+            classifyPage(page, document, headlineFontSizes);
        }
    }


-    public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyPage(Page page, Document document, List<Float> headlineFontSizes) {

        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
            if (textBlock instanceof TextBlock) {
-                classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
+                classifyBlock((TextBlock) textBlock, page, document, headlineFontSizes);
            }
        }
    }


-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
-                              List<Float> headlineFontSizes) {
+    public void classifyBlock(TextBlock textBlock, Page page, Document document, List<Float> headlineFontSizes) {
+
+        var bodyTextFrame = page.getBodyTextFrame();

        if (document.getFontSizeCounter().getMostPopular() == null) {
-            // TODO Figure out why this happens.
+            textBlock.setClassification("Other");
            return;
        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
-                .getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification("Header");

-        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
-                .getMostPopular())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
            textBlock.setClassification("Footer");
-        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
-                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
-                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
-                .getMostPopular() || page.getTextBlocks().size() == 1)) {
+        } else if (page.getPageNumber() == 1 && (PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock,
+                document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks()
+                .size() == 1)) {
            if (!Pattern.matches("[0-9]+", textBlock.toString())) {
                textBlock.setClassification("Title");
            }
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
-                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
+        } else if (textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle().equals("bold") || !document.getFontStyleCounter()
+                .getCountPerValue()
+                .containsKey("bold") && textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter().getMostPopular() + 1) && textBlock.getSequences()
+                .get(0)
+                .getTextPositions()
+                .get(0)
+                .getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -84,33 +84,32 @@ public class ClassificationService {
                    document.setHeadlines(true);
                }
            }
-        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
-                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
-                .equals("bold") && !document.getFontStyleCounter()
+        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame,
+                textBlock) && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter()
                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences()
+                .get(0)
+                .getTextPositions()
+                .get(0)
+                .getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
-                .getFontSizeCounter()
-                .getMostPopular() && textBlock.getMostPopularWordStyle()
-                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
            textBlock.setClassification("TextBlock Bold");
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
-                .equals(document.getFontStyleCounter()
-                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
-                .getMostPopular()) {
+                .equals(document.getFontStyleCounter().getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular()) {
            textBlock.setClassification("TextBlock");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
-                .getFontSizeCounter()
-                .getMostPopular() && textBlock.getMostPopularWordStyle()
-                .equals("italic") && !document.getFontStyleCounter()
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle().equals("italic") && !document.getFontStyleCounter()
                .getMostPopular()
                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("TextBlock Italic");
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
            textBlock.setClassification("TextBlock Unknown");
+        } else {
+            textBlock.setClassification("Other");
        }
    }

@@ -1,29 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.classification.utils;

+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.experimental.UtilityClass;

@UtilityClass
@SuppressWarnings("all")
-public class PositionUtils {
-
+public final class PositionUtils {

+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
    public boolean isWithinBodyTextFrame(Rectangle btf, TextBlock textBlock) {

-        //TODO Currently this is not working for rotated pages.
-
        if (btf == null || textBlock == null) {
            return false;
        }

        double threshold = textBlock.getMostPopularWordHeight() * 3;

-        if (textBlock.getMinX() + threshold > btf.getX() &&
-                textBlock.getMaxX() - threshold < btf.getX() + btf.getWidth() &&
-                textBlock.getMinY() + threshold > btf.getY() &&
-                textBlock.getMaxY() - threshold < btf.getY() + btf.getHeight()) {
+        if (textBlock.getPdfMinX() + threshold > btf.getTopLeft().getX() && textBlock.getPdfMaxX() - threshold < btf.getTopLeft()
+                .getX() + btf.getWidth() && textBlock.getPdfMinY() + threshold > btf.getTopLeft().getY() && textBlock.getPdfMaxY() - threshold < btf.getTopLeft()
+                .getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -32,16 +30,27 @@ public class PositionUtils {
    }


-    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, boolean rotated) {
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
+    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {

        if (btf == null || textBlock == null) {
            return false;
        }

-        if (rotated && textBlock.getMinX() < btf.getX()) {
-            // Its very strange, P{0,0} is on top left in this case, instead of lower left.
+        if (rotation == 90 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
            return true;
-        } else if (!rotated && textBlock.getMinY() > btf.getY() + btf.getHeight()) {
+        }
+
+        if (rotation == 180 && textBlock.getPdfMaxY() < btf.getTopLeft().getY()) {
+            return true;
+        }
+
+        if (rotation == 270 && textBlock.getPdfMinX() > btf.getTopLeft().getX() + btf.getWidth()) {
+            return true;
+        }
+
+        if (rotation == 0 && textBlock.getPdfMinY() > btf.getTopLeft().getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -49,16 +58,27 @@ public class PositionUtils {

    }

-
-    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
-
-        //TODO Currently this is not working for rotated pages.
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
+    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {

        if (btf == null || textBlock == null) {
            return false;
        }

-        if (textBlock.getMaxY() < btf.getY()) {
+        if (rotation == 90 && textBlock.getPdfMinX() > btf.getTopLeft().getX() + btf.getWidth()) {
+            return true;
+        }
+
+        if (rotation == 180 && textBlock.getPdfMinY() > btf.getTopLeft().getY() + btf.getHeight()) {
+            return true;
+        }
+
+        if (rotation == 270 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
+            return true;
+        }
+
+        if (rotation == 0 && textBlock.getPdfMaxY() < btf.getTopLeft().getY()) {
            return true;
        } else {
            return false;
@@ -66,7 +86,8 @@ public class PositionUtils {

    }

-
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
    public boolean isTouchingUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {

        //TODO Currently this is not working for rotated pages.
@@ -75,7 +96,7 @@ public class PositionUtils {
            return false;
        }

-        if (textBlock.getMinY() < btf.getY()) {
+        if (textBlock.getMinY() < btf.getTopLeft().getY()) {
            return true;
        } else {
            return false;
@@ -85,11 +106,14 @@ public class PositionUtils {


    public float getHeightDifferenceBetweenChunkWordAndDocumentWord(TextBlock textBlock, Float documentMostPopularWordHeight) {
+
        return textBlock.getMostPopularWordHeight() - documentMostPopularWordHeight;
    }


    public Float getApproxLineCount(TextBlock textBlock) {
+
        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
    }
+
 }
@@ -0,0 +1,64 @@
+package com.iqser.red.service.redaction.v1.server.classification.utils;
+
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public final class RulingTextDirAdjustUtil {
+
+    /**
+     * Converts a ruling (line of a table) the same way TextPositions are converted in PDFBox.
+     * This will get the y position of the text, adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     *
+     * See org.apache.pdfbox.text.TextPosition
+     */
+    public Line2D.Float convertToDirAdj(Ruling ruling, float dir, float pageWidth, float pageHeight) {
+
+        return new Line2D.Float(convertPoint(ruling.x1, ruling.y1, dir, pageWidth, pageHeight), convertPoint(ruling.x2, ruling.y2, dir, pageWidth, pageHeight));
+    }
+
+
+    private Point2D convertPoint(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        var xAdj = getXRot(x, y, dir, pageWidth, pageHeight);
+        var yLowerLeftRot = getYLowerLeftRot(x, y, dir, pageWidth, pageHeight);
+        var yAdj = dir == 0 || dir == 180 ? pageHeight - yLowerLeftRot : pageWidth - yLowerLeftRot;
+        return new Point2D.Float(xAdj, yAdj);
+    }
+
+
+    @SuppressWarnings("SuspiciousNameCombination")
+    private float getXRot(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        if (dir == 0) {
+            return x;
+        } else if (dir == 90) {
+            return y;
+        } else if (dir == 180) {
+            return pageWidth - x;
+        } else if (dir == 270) {
+            return pageHeight - y;
+        }
+        return 0;
+    }
+
+
+    private float getYLowerLeftRot(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        if (dir == 0) {
+            return y;
+        } else if (dir == 90) {
+            return pageWidth - x;
+        } else if (dir == 180) {
+            return pageHeight - y;
+        } else if (dir == 270) {
+            return x;
+        }
+        return 0;
+    }
+
+}
@@ -2,9 +2,9 @@ package com.iqser.red.service.redaction.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.DictionaryResource;

-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
-}
+
+}
@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileStatusProcessingUpdateResource;
+
+@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
+public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
+
+}
@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.LegalBasisMappingResource;
+
+@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
+public interface LegalBasisClient extends LegalBasisMappingResource {
+
+}
@@ -0,0 +1,100 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+public class MockMultipartFile implements MultipartFile {
+
+    private final String name;
+    private final String originalFilename;
+    @Nullable
+    private final String contentType;
+    private final byte[] content;
+
+
+    public MockMultipartFile(String name, @Nullable byte[] content) {
+
+        this(name, "", null, content);
+    }
+
+
+    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
+
+        this(name, "", null, FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, @Nullable byte[] content) {
+
+        Assert.hasLength(name, "Name must not be empty");
+        this.name = name;
+        this.originalFilename = originalFilename != null ? originalFilename : "";
+        this.contentType = contentType;
+        this.content = content != null ? content : new byte[0];
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, InputStream contentStream) throws IOException {
+
+        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public String getName() {
+
+        return this.name;
+    }
+
+
+    @NonNull
+    public String getOriginalFilename() {
+
+        return this.originalFilename;
+    }
+
+
+    @Nullable
+    public String getContentType() {
+
+        return this.contentType;
+    }
+
+
+    public boolean isEmpty() {
+
+        return this.content.length == 0;
+    }
+
+
+    public long getSize() {
+
+        return this.content.length;
+    }
+
+
+    public byte[] getBytes() {
+
+        return this.content;
+    }
+
+
+    public InputStream getInputStream() {
+
+        return new ByteArrayInputStream(this.content);
+    }
+
+
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+
+        FileCopyUtils.copy(this.content, dest);
+    }
+
+}
@@ -2,8 +2,9 @@ package com.iqser.red.service.redaction.v1.server.client;

 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.RulesResource;

-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
-}
+
+}
@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.TenantsResource;
+
+@FeignClient(name = "TenantsResource", url = "${persistence-service.url}")
+public interface TenantsClient extends TenantsResource {
+
+}
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecognitionEntity {
+
+    private String value;
+    private int startOffset;
+    private int endOffset;
+    private String type;
+
+}
@@ -1,6 +1,4 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.time.OffsetDateTime;
+package com.iqser.red.service.redaction.v1.server.client.model;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -11,11 +9,9 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Comment {
+public class EntityRecognitionSection {

-    private String id;
-    private OffsetDateTime date;
+    private int sectionNumber;
    private String text;
-    private String user;

 }
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class NerEntities {
+
+    private Map<Integer, List<EntityRecognitionEntity>> data = new HashMap<>();
+
+}
@@ -1,17 +1,18 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import java.time.OffsetDateTime;
-
 import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+
+import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-
-import lombok.extern.slf4j.Slf4j;
+import java.time.OffsetDateTime;

@Slf4j
@RestControllerAdvice
@@ -19,10 +20,12 @@ public class ControllerAdvice {

    /* error handling */

+
    @ResponseBody
    @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
    @ExceptionHandler(value = NullPointerException.class)
    public ErrorMessage handleContentNotFoundException(NullPointerException e) {
+
        if (e != null) {
            log.error(e.getMessage(), e);
            return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
@@ -31,11 +34,22 @@ public class ControllerAdvice {
        return new ErrorMessage(OffsetDateTime.now(), "Nullpointer exception");
    }

+
    @ResponseBody
    @ResponseStatus(value = HttpStatus.BAD_REQUEST)
    @ExceptionHandler(value = RulesValidationException.class)
    public ErrorMessage handleRulesValidationException(RulesValidationException e) {
+
        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
    }

-}
+
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
+
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
+}
@@ -1,30 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.AnnotationHighlightService;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,129 +15,17 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class RedactionController implements RedactionResource {

-    private final PdfVisualisationService pdfVisualisationService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final AnnotationHighlightService annotationHighlightService;
-    private final EntityRedactionService entityRedactionService;
    private final DroolsExecutionService droolsExecutionService;


    @Override
-    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
+    public void testRules(@RequestBody String rules) {

-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-
-            log.info("Document structure analysis successful, starting redaction analysis...");
-
-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
-                    .getManualRedactions());
-
-            log.info("Redaction analysis successful...");
-
-            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
+        try {
+            droolsExecutionService.testRules(rules);
+        } catch (Exception e) {
+            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
        }
-
-    }
-
-
-    @Override
-    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
-
-            return convert(pdDocument, classifiedDoc.getPages().size());
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    @Override
-    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
-
-            return convert(pdDocument, classifiedDoc.getPages().size());
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    @Override
-    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-
-            StringBuilder sb = new StringBuilder();
-            for (Page page : classifiedDoc.getPages()) {
-                for (AbstractTextContainer textContainer : page.getTextBlocks()) {
-                    if (textContainer instanceof Table) {
-                        Table table = (Table) textContainer;
-                        sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
-                    }
-                }
-            }
-
-            return RedactionResult.builder().document(sb.toString().getBytes()).build();
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    @Override
-    public void updateRules(@RequestBody String rules) {
-
-        droolsExecutionService.updateRules(rules);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-
-        return convert(document, numberOfPages, null, null, 0, 0);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {
-
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            document.save(byteArrayOutputStream);
-            return RedactionResult.builder()
-                    .document(byteArrayOutputStream.toByteArray())
-                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
-                    .sectionGrid(sectionGrid)
-                    .build();
-        }
-
    }

 }
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.controller;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
+import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class RuleBuilderController implements RuleBuilderResource {
+
+    private final RuleBuilderModelService ruleBuilderModelService;
+
+
+    @Override
+    public RuleBuilderModel getRuleBuilderModel() {
+
+        return ruleBuilderModelService.getRuleBuilderModel();
+    }
+
+}
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class AtomicPositionBlockData {
+
+    Long id;
+    int[] stringIdxToPositionIdx;
+    float[][] positions;
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class AtomicTextBlockData {
+
+    Long id;
+    Long page;
+    String searchText;
+    int numberOnPage;
+    int start;
+    int end;
+    int[] lineBreaks;
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class DocumentData {
+
+    PageData[] pages;
+    AtomicTextBlockData[] atomicTextBlocks;
+    AtomicPositionBlockData[] atomicPositionBlocks;
+    TableOfContentsData tableOfContents;
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class PageData {
+
+    int number;
+    int height;
+    int width;
+    int rotation;
+
+}
@@ -0,0 +1,93 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.document.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
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class TableOfContentsData {
+
+    EntryData root;
+
+
+    public EntryData get(List<Integer> tocId) {
+
+        if (tocId.isEmpty()) {
+            return root;
+        }
+        EntryData entry = root.subEntries.get(tocId.get(0));
+        for (int id : tocId.subList(1, tocId.size())) {
+            entry = entry.subEntries.get(id);
+        }
+        return entry;
+    }
+
+
+    public Stream<EntryData> streamAllEntries() {
+
+        return Stream.concat(Stream.of(root), root.subEntries.stream()).flatMap(TableOfContentsData::flatten);
+    }
+
+
+    public String toString() {
+
+        return String.join("\n", streamAllEntries().map(EntryData::toString).toList());
+    }
+
+
+    private static Stream<EntryData> flatten(EntryData entry) {
+
+        return Stream.concat(Stream.of(entry), entry.subEntries.stream().flatMap(TableOfContentsData::flatten));
+    }
+
+
+    @Builder
+    @Getter
+    @AllArgsConstructor
+    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+    public static class EntryData {
+
+        NodeType type;
+        int[] tocId;
+        Long[] atomicBlocks;
+        Long[] pages;
+        Map<String, String> properties;
+        List<EntryData> subEntries;
+
+
+        @Override
+        public String toString() {
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("[");
+            for (int i : tocId) {
+                sb.append(i);
+                sb.append(",");
+            }
+            sb.delete(sb.length() - 1, sb.length());
+            sb.append("]: ");
+
+            sb.append(type);
+            sb.append(" atbs = ");
+            sb.append(atomicBlocks.length);
+
+            return sb.toString();
+        }
+
+    }
+
+}
@@ -0,0 +1,150 @@
+package com.iqser.red.service.redaction.v1.server.document.graph;
+
+import static java.lang.String.format;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import lombok.Setter;
+
+@Setter
+public class Boundary implements Comparable<Boundary> {
+
+    private int start;
+    private int end;
+
+
+    public Boundary(int start, int end) {
+
+        if (start > end) {
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
+        }
+        this.start = start;
+        this.end = end;
+    }
+
+
+    public int length() {
+
+        return end - start;
+    }
+
+
+    public int start() {
+
+        return start;
+    }
+
+
+    public int end() {
+
+        return end;
+    }
+
+
+    public boolean contains(Boundary boundary) {
+
+        return start <= boundary.start() && boundary.end() <= end;
+    }
+
+
+    public boolean containedBy(Boundary boundary) {
+
+        return boundary.contains(this);
+    }
+
+
+    public boolean contains(int start, int end) {
+
+        if (start > end) {
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
+        }
+        return this.start <= start && end <= this.end;
+    }
+
+
+    public boolean containedBy(int start, int end) {
+
+        if (start > end) {
+            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
+        }
+        return start <= this.start && this.end <= end;
+    }
+
+
+    public boolean contains(int index) {
+
+        return start <= index && index < end;
+    }
+
+
+    public boolean intersects(Boundary boundary) {
+
+        return contains(boundary.start()) || contains(boundary.end() - 1);
+    }
+
+
+    public List<Boundary> split(List<Integer> splitIndices) {
+
+        if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
+            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;
+        for (int splitIndex : splitIndices) {
+
+            // skip split if it would produce a boundary of length 0
+            if (splitIndex == previousIndex) {
+                continue;
+            }
+            splitBoundaries.add(new Boundary(previousIndex, splitIndex));
+            previousIndex = splitIndex;
+        }
+        splitBoundaries.add(new Boundary(previousIndex, end));
+        return splitBoundaries;
+    }
+
+
+    public static Boundary merge(List<Boundary> boundaries) {
+
+        int minStart = boundaries.stream().mapToInt(Boundary::start).min().orElseThrow(IllegalArgumentException::new);
+        int maxEnd = boundaries.stream().mapToInt(Boundary::end).max().orElseThrow(IllegalArgumentException::new);
+        return new Boundary(minStart, maxEnd);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return format("Boundary [%d|%d)", start, end);
+    }
+
+
+    @Override
+    public int compareTo(Boundary boundary) {
+
+        if (end < boundary.end() && start < boundary.start()) {
+            return -1;
+        }
+        if (start > boundary.start() && end > boundary.end()) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return toString().hashCode();
+    }
+
+
+    @Override
+    public boolean equals(Object object) {
+
+        return hashCode() == object.hashCode();
+    }
+
+}
@@ -0,0 +1,101 @@
+package com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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;
+    }
+
+}
@@ -0,0 +1,196 @@
+package com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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).children.stream().flatMap(TableOfContents::flatten);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.join("\n", streamAllEntriesInOrder().map(Entry::toString).toList());
+    }
+
+
+    private static Stream<Entry> flatten(Entry entry) {
+
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(TableOfContents::flatten));
+    }
+
+
+    public SemanticNode getHighestParentById(List<Integer> tocId) {
+
+        if (tocId.isEmpty()) {
+            return root.node;
+        }
+        return root.children.get(tocId.get(0)).node;
+    }
+
+
+    @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();
+        }
+
+    }
+
+}
@@ -0,0 +1,206 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.hash.Hashing;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class EntityNode {
+
+    // initial values
+    final Boundary boundary;
+    final String type;
+    final EntityType entityType;
+
+    // empty defaults
+    boolean redaction;
+    boolean removed;
+    boolean ignored;
+    boolean resized;
+    boolean skipRemoveEntitiesContainedInLarger;
+    boolean dictionaryEntry;
+    boolean dossierDictionaryEntry;
+    Set<Engine> engines;
+    Set<EntityNode> references;
+    int matchedRule;
+    String redactionReason;
+    String legalBasis;
+
+    // inferred on graph insertion
+    String value;
+    CharSequence textBefore;
+    CharSequence textAfter;
+    @Builder.Default
+    Set<PageNode> pages = new HashSet<>();
+    List<RedactionPosition> redactionPositionsPerPage;
+    @Builder.Default
+    List<SemanticNode> intersectingNodes = new LinkedList<>();
+    SemanticNode deepestFullyContainingNode;
+
+
+    public static EntityNode initialEntityNode(Boundary boundary, String type, EntityType entityType) {
+
+        return EntityNode.builder()
+                .type(type)
+                .entityType(entityType)
+                .boundary(boundary)
+                .redaction(false)
+                .removed(false)
+                .ignored(false)
+                .resized(false)
+                .skipRemoveEntitiesContainedInLarger(false)
+                .dictionaryEntry(false)
+                .dossierDictionaryEntry(false)
+                .engines(new HashSet<>())
+                .references(new HashSet<>())
+                .matchedRule(-1)
+                .redactionReason("")
+                .legalBasis("")
+                .build();
+    }
+
+
+    public void addIntersectingNode(SemanticNode containingNode) {
+
+        intersectingNodes.add(containingNode);
+    }
+
+
+    public void removeFromGraph() {
+
+        getIntersectingNodes().forEach(node -> node.getEntities().remove(this));
+        deepestFullyContainingNode = null;
+        getPages().forEach(page -> page.getEntities().remove(this));
+        setRemoved(true);
+    }
+
+
+    public List<RedactionPosition> getRedactionPositionsPerPage() {
+
+        if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
+            Map<PageNode, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.buildTextBlock().getEntityPositionsPerPage(boundary);
+
+            PageNode firstPage = rectanglesPerLinePerPage.keySet()
+                    .stream()
+                    .min(Comparator.comparingInt(PageNode::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(PageNode firstPage, String id, Map.Entry<PageNode, 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(EntityNode entityNode) {
+
+        return this.boundary.containedBy(entityNode.getBoundary());
+    }
+
+
+    public boolean contains(EntityNode entityNode) {
+
+        return this.boundary.contains(entityNode.getBoundary());
+    }
+
+
+    public boolean intersects(EntityNode entityNode) {
+
+        return this.boundary.intersects(entityNode.getBoundary());
+    }
+
+
+    public void addEngine(Engine engine) {
+
+        engines.add(engine);
+    }
+
+
+    public void addEngines(Set<Engine> engines) {
+
+        this.engines.addAll(engines);
+    }
+
+
+    public void addReference(EntityNode entityNode) {
+
+        references.add(entityNode);
+    }
+
+
+    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();
+    }
+
+
+    @Override
+    public int hashCode() {
+
+        return Hashing.murmur3_128().hashString(toString(), StandardCharsets.UTF_8).hashCode();
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+
+        return o.hashCode() == hashCode();
+    }
+
+}
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+
+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;
+    PageNode pageNode;
+    List<Rectangle2D> rectanglePerLine;
+
+}
@@ -0,0 +1,390 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.factory;
+
+import static java.lang.String.format;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+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.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
+import com.iqser.red.service.redaction.v1.server.classification.model.Header;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.FooterNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.HeaderNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.HeadlineNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ParagraphNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCellNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
+@Service
+public class DocumentGraphFactory {
+
+    public static final double TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD = 0.05;
+
+
+    public DocumentGraph buildDocumentGraph(Document 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));
+        addSections(document, context);
+        addHeaderAndFooterToEachPage(document, context);
+
+        documentGraph.setNumberOfPages(context.pages.size());
+        documentGraph.setPages(context.pages.keySet());
+        documentGraph.setTableOfContents(context.tableOfContents);
+        documentGraph.setTextBlock(documentGraph.buildTextBlock());
+        return documentGraph;
+    }
+
+
+    private void addSections(Document document, Context context) {
+
+        document.getSections().forEach(section -> addSection(null, section.getPageBlocks(), section.getImages(), context));
+    }
+
+
+    private void addSection(SemanticNode parentNode, List<AbstractTextContainer> pageBlocks, List<PdfImage> images, Context context) {
+
+        Map<Integer, List<AbstractTextContainer>> blocksPerPage = pageBlocks.stream().collect(groupingBy(AbstractTextContainer::getPage));
+        SectionNode sectionNode = SectionNode.builder().entities(new HashSet<>()).tableOfContents(context.tableOfContents()).build();
+
+        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);
+        } 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 TextBlock) {
+                List<TextBlock> textBlocks = findTextBlocksWithSameClassificationAndAlignsY(abstractTextContainer, pageBlocks);
+                alreadyMerged.addAll(textBlocks);
+                addParagraphOrHeadline(sectionNode, (TextBlock) abstractTextContainer, context, textBlocks);
+            }
+            if (abstractTextContainer instanceof Table) {
+                addTable(sectionNode, (Table) abstractTextContainer, context);
+            }
+        }
+        for (PdfImage image : images) {
+
+            addImage(sectionNode, image, context);
+        }
+    }
+
+
+    private static List<TextBlock> findTextBlocksWithSameClassificationAndAlignsY(AbstractTextContainer atc, List<AbstractTextContainer> pageBlocks) {
+
+        return pageBlocks.stream()
+                .filter(abstractTextContainer -> !abstractTextContainer.equals(atc))
+                .filter(abstractTextContainer -> abstractTextContainer.getPage() == atc.getPage())
+                .filter(abstractTextContainer -> abstractTextContainer instanceof TextBlock)
+                .filter(abstractTextContainer -> abstractTextContainer.intersectsY(atc))
+                .map(abstractTextContainer -> (TextBlock) 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<Cell>> 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(Cell 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);
+
+        com.iqser.red.service.redaction.v1.server.document.graph.textblock.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(Cell cell, PageNode page) {
+
+        return cell.getArea() < TABLE_CELL_MERGE_CONTENTS_SIZE_THRESHOLD * page.getHeight() * page.getWidth();
+    }
+
+
+    private static boolean firstTextBlockIsHeadline(Cell cell) {
+
+        String classification = cell.getTextBlocks().get(0).getClassification();
+        return classification != null && classification.startsWith("H");
+    }
+
+
+    private void addParagraphOrHeadline(SemanticNode parentNode, TextBlock originalTextBlock, Context context) {
+
+        addParagraphOrHeadline(parentNode, originalTextBlock, context, Collections.emptyList());
+    }
+
+
+    private void addParagraphOrHeadline(SemanticNode parentNode, TextBlock originalTextBlock, Context context, List<TextBlock> 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();
+        }
+
+        page.getMainBody().add(node);
+
+        List<TextBlock> textBlocks = new LinkedList<>(textBlocksToMerge);
+        textBlocks.add(originalTextBlock);
+        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);
+        }
+    }
+
+
+    private void addImage(SectionNode sectionNode, PdfImage image, Context context) {
+
+        Rectangle2D position = RectangleTransformations.toRectangle2D(image.getPosition());
+        PageNode page = getPage(image.getPage(), context);
+        ImageNode imageNode = ImageNode.builder()
+                .id(IdBuilder.buildId(Set.of(page), List.of(position)))
+                .imageType(image.getImageType())
+                .position(position)
+                .transparency(image.isHasTransparency())
+                .page(page)
+                .tableOfContents(context.tableOfContents())
+                .build();
+        page.getMainBody().add(imageNode);
+
+        List<Integer> tocId = context.tableOfContents().createNewChildEntryAndReturnId(sectionNode.getTocId(), NodeType.IMAGE, imageNode);
+        imageNode.setTocId(tocId);
+    }
+
+
+    private void addHeaderAndFooterToEachPage(Document document, Context context) {
+
+        Map<Integer, List<TextBlock>> headers = document.getHeaders()
+                .stream()
+                .map(Header::getTextBlocks)
+                .flatMap(List::stream)
+                .collect(groupingBy(AbstractTextContainer::getPage, toList()));
+
+        Map<Integer, List<TextBlock>> footers = document.getFooters()
+                .stream()
+                .map(Footer::getTextBlocks)
+                .flatMap(List::stream)
+                .collect(groupingBy(AbstractTextContainer::getPage, toList()));
+
+        for (int pageIndex = 1; pageIndex <= document.getPages().size(); pageIndex++) {
+            if (headers.containsKey(pageIndex)) {
+                addHeader(headers.get(pageIndex), context);
+            } else {
+                addEmptyHeader(pageIndex, context);
+            }
+        }
+
+        for (int pageIndex = 1; pageIndex <= document.getPages().size(); pageIndex++) {
+            if (footers.containsKey(pageIndex)) {
+                addFooter(footers.get(pageIndex), context);
+            } else {
+                addEmptyFooter(pageIndex, context);
+            }
+        }
+    }
+
+
+    private void addFooter(List<TextBlock> textBlocks, Context context) {
+
+        PageNode page = getPage(textBlocks.get(0).getPage(), context);
+        FooterNode footer = FooterNode.builder().tableOfContents(context.tableOfContents()).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);
+        page.setFooter(footer);
+    }
+
+
+    public void addHeader(List<TextBlock> 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.setHeader(header);
+    }
+
+
+    private void addEmptyFooter(int pageIndex, Context context) {
+
+        PageNode page = getPage(pageIndex, context);
+        FooterNode footer = FooterNode.builder().tableOfContents(context.tableOfContents()).build();
+        AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(footer, context, page);
+        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.FOOTER, footer);
+        footer.setTocId(tocId);
+        footer.setTerminalTextBlock(textBlock);
+        page.setFooter(footer);
+    }
+
+
+    private void addEmptyHeader(int pageIndex, Context context) {
+
+        PageNode page = getPage(pageIndex, context);
+        HeaderNode header = HeaderNode.builder().tableOfContents(context.tableOfContents()).build();
+        AtomicTextBlock textBlock = context.textBlockFactory.emptyTextBlock(header, 0, page);
+        List<Integer> tocId = context.tableOfContents().createNewMainEntryAndReturnId(NodeType.HEADER, header);
+        header.setTocId(tocId);
+        header.setTerminalTextBlock(textBlock);
+        page.setHeader(header);
+    }
+
+
+    private PageNode buildPage(Page p) {
+
+        return PageNode.builder()
+                .height((int) p.getPageHeight())
+                .width((int) p.getPageWidth())
+                .number(p.getPageNumber())
+                .rotation(p.getRotation())
+                .mainBody(new LinkedList<>())
+                .build();
+    }
+
+
+    private PageNode getPage(int pageIndex, Context context) {
+
+        return context.pages.keySet()
+                .stream()
+                .filter(page -> page.getNumber() == pageIndex)
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException(format("ClassificationPage with number %d not found", pageIndex)));
+    }
+
+
+    record Context(
+            TableOfContents tableOfContents, Map<PageNode, AtomicInteger> pages, List<SectionNode> sections, List<PdfImage> images, TextBlockFactory textBlockFactory) {
+
+    }
+
+}
@@ -0,0 +1,162 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.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.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.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 bBoxUnionAtomicTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
+
+        return atomicTextBlocks.stream().flatMap(atomicTextBlock -> atomicTextBlock.getPositions().stream()).collect(new Rectangle2DUnion());
+    }
+
+
+    public static Rectangle2D bBoxUnionRectangle(List<Rectangle> rectangles) {
+
+        return rectangles.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(RedRectangle2D redRectangle2D) {
+
+        return new Rectangle2D.Double(redRectangle2D.getX(), redRectangle2D.getY(), redRectangle2D.getWidth(), redRectangle2D.getHeight());
+    }
+
+
+    public static Rectangle2D toRectangle2D(Rectangle rectangle) {
+
+        return new Rectangle2D.Double(rectangle.getTopLeft().getX() - rectangle.getWidth(),
+                rectangle.getTopLeft().getY() - rectangle.getHeight(),
+                rectangle.getWidth(),
+                rectangle.getHeight());
+    }
+
+
+    public static Rectangle2D toRectangle2D(PDRectangle rectangle) {
+
+        return new Rectangle2D.Double(rectangle.getLowerLeftX(), rectangle.getLowerLeftY(), rectangle.getWidth(), rectangle.getHeight());
+    }
+
+
+    public static PDRectangle toPDRectangleUnion(List<Rectangle> rectangles) {
+
+        Rectangle2D rectangle2D = RectangleTransformations.bBoxUnionRectangle(rectangles);
+
+        PDRectangle annotationPosition = new PDRectangle();
+        annotationPosition.setLowerLeftX((float) rectangle2D.getMinX());
+        annotationPosition.setLowerLeftY((float) rectangle2D.getMinY());
+        annotationPosition.setUpperRightX((float) rectangle2D.getMaxX());
+        annotationPosition.setUpperRightY((float) rectangle2D.getMaxY());
+        return annotationPosition;
+    }
+
+
+    public static Rectangle toRectangle(Rectangle2D rectangle2D, int pageNumber) {
+
+        return new Rectangle(new Point((float) rectangle2D.getMaxX(), (float) rectangle2D.getMaxY()), (float) rectangle2D.getWidth(), (float) rectangle2D.getHeight(), pageNumber);
+    }
+
+
+    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));
+    }
+
+
+    public static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rect) {
+
+        return new Rectangle2D.Double(rect.getTopLeftX() - rect.getWidth(), rect.getTopLeftY() - rect.getHeight(), rect.getWidth(), rect.getHeight());
+    }
+
+
+    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);
+        }
+
+    }
+
+}
@@ -0,0 +1,156 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.factory;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextDirection;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+public class SearchTextWithTextPositionFactory {
+
+    public static final int HEIGHT_PADDING = 2;
+
+
+    public static SearchTextWithTextPositionModel buildSearchTextToTextPositionModel(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();
+        }
+
+        List<Integer> stringIdxToPositionIdx = new LinkedList<>();
+        List<Integer> lineBreaksStringIdx = new LinkedList<>();
+        StringBuilder sb = new StringBuilder();
+
+        int stringIdx = 0;
+        int positionIdx = 0;
+        int lastHyphenIdx = -3;
+
+        RedTextPosition currentTextPosition = sequences.get(0).getTextPositions().get(0);
+        RedTextPosition previousTextPosition = RedTextPosition.builder().unicode(" ").position(currentTextPosition.getPosition()).build();
+
+        for (TextPositionSequence word : sequences) {
+            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);
+                }
+                if (!isRepeatedWhitespace(currentTextPosition.getUnicode(), previousTextPosition.getUnicode())) {
+
+                    if (isHyphen(currentTextPosition.getUnicode())) {
+                        lastHyphenIdx = stringIdx;
+                    }
+                    sb.append(currentTextPosition.getUnicode());
+                    stringIdxToPositionIdx.add(positionIdx);
+                    ++stringIdx;
+                }
+
+                previousTextPosition = currentTextPosition;
+
+                ++positionIdx;
+            }
+
+            previousTextPosition = RedTextPosition.builder().unicode(" ").position(previousTextPosition.getPosition()).build();
+            sb.append(previousTextPosition.getUnicode());
+            stringIdxToPositionIdx.add(positionIdx);
+            ++stringIdx;
+        }
+
+        assert sb.length() == 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)
+                .positions(positions)
+                .build();
+    }
+
+
+    private static boolean isLineBreak(RedTextPosition currentTextPosition, RedTextPosition previousTextPosition) {
+
+        return Objects.equals(currentTextPosition.getUnicode(), "\n") || isDeltaYLargerThanTextHeight(currentTextPosition, previousTextPosition);
+    }
+
+
+    private static boolean isDeltaYLargerThanTextHeight(RedTextPosition currentPosition, RedTextPosition previousPosition) {
+
+        if (previousPosition == null) {
+            return false;
+        }
+
+        float deltaY = Math.abs(currentPosition.getYDirAdj() - previousPosition.getYDirAdj());
+        return deltaY >= currentPosition.getHeightDir();
+    }
+
+
+    private static boolean isRepeatedWhitespace(String currentUnicode, String previousUnicode) {
+
+        return Objects.equals(previousUnicode, " ") && Objects.equals(currentUnicode, " ");
+    }
+
+
+    private static boolean isHyphen(String unicodeCharacter) {
+
+        return Objects.equals(unicodeCharacter, "-") || //
+                Objects.equals(unicodeCharacter, "~") || //
+                Objects.equals(unicodeCharacter, "‐") || //
+                Objects.equals(unicodeCharacter, "‒") || //
+                Objects.equals(unicodeCharacter, "⁻") || //
+                Objects.equals(unicodeCharacter, "−") || //
+                Objects.equals(unicodeCharacter, "﹣") || //
+                Objects.equals(unicodeCharacter, "゠") || //
+                Objects.equals(unicodeCharacter, "⁓") || //
+                Objects.equals(unicodeCharacter, "‑") || //
+                Objects.equals(unicodeCharacter, "\u00AD");
+    }
+
+
+    private static Rectangle2D mapRedTextPositionToInitialUserSpace(RedTextPosition textPosition, TextPositionSequence sequence) {
+
+        float textHeight = sequence.getTextHeight() + HEIGHT_PADDING;
+        Rectangle2D rectangle2D = new Rectangle2D.Double(textPosition.getXDirAdj(),
+                textPosition.getYDirAdj() - textHeight,
+                textPosition.getWidthDirAdj(),
+                textHeight + HEIGHT_PADDING);
+
+        AffineTransform transform = new AffineTransform();
+
+        if (sequence.getDir() == TextDirection.ZERO || sequence.getDir() == TextDirection.HALF_CIRCLE) {
+            transform.rotate(sequence.getDir().getRadians(), sequence.getPageWidth() / 2f, sequence.getPageHeight() / 2f);
+            transform.translate(0f, sequence.getPageHeight());
+        } else if (sequence.getDir() == TextDirection.QUARTER_CIRCLE) {
+            transform.rotate(sequence.getDir().getRadians(), sequence.getPageWidth() / 2f, sequence.getPageWidth() / 2f);
+            transform.translate(0f, sequence.getPageWidth());
+        } else {
+            transform.rotate(sequence.getDir().getRadians(), sequence.getPageHeight() / 2f, sequence.getPageHeight() / 2f);
+            transform.translate(0f, sequence.getPageWidth());
+        }
+        transform.scale(1., -1.);
+
+        return transform.createTransformedShape(rectangle2D).getBounds2D();
+    }
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.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;
+}
@@ -0,0 +1,78 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.factory;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+public class TextBlockFactory {
+
+    AtomicInteger stringOffset;
+    AtomicLong textBlockIdx;
+
+
+    public TextBlockFactory() {
+
+        stringOffset = new AtomicInteger();
+        textBlockIdx = new AtomicLong();
+    }
+
+
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, SemanticNode parent, DocumentGraphFactory.Context context, PageNode page) {
+
+        Integer numberOnPage = context.pages().get(page).getAndIncrement();
+        return buildAtomicTextBlock(sequences, parent, context, numberOnPage, page);
+    }
+
+
+    public AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences,
+                                                SemanticNode parent,
+                                                DocumentGraphFactory.Context context,
+                                                Integer numberOnPage,
+                                                PageNode 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();
+    }
+
+
+    public AtomicTextBlock emptyTextBlock(SemanticNode parent, DocumentGraphFactory.Context context, PageNode 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();
+    }
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.factory;
+
+import java.util.Comparator;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+public class TextPositionOperations {
+
+    public static List<TextPositionSequence> mergeAndSortTextPositionSequenceByYThenX(List<TextBlock> textBlocks) {
+
+        return textBlocks.stream()//
+                .flatMap(tb -> tb.getSequences().stream())//
+                .sorted(Comparator.comparingDouble(TextPositionSequence::getMaxYDirAdj)//
+                        .thenComparing(TextPositionSequence::getMaxXDirAdj))//
+                .toList();
+    }
+
+}
@@ -0,0 +1,53 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.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();
+    }
+
+}
@@ -0,0 +1,53 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.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();
+    }
+
+}
@@ -0,0 +1,60 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.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;
+    }
+
+}
@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+
+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;
+    String id;
+
+    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;
+    }
+
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+public enum NodeType {
+    DOCUMENT,
+    SECTION,
+    HEADLINE,
+    PARAGRAPH,
+    TABLE,
+    TABLE_CELL,
+    IMAGE,
+    HEADER,
+    FOOTER
+}
@@ -0,0 +1,73 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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();
+    }
+
+}
@@ -0,0 +1,51 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.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();
+    }
+
+}
@@ -0,0 +1,64 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@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 NotFoundException("Section has no Headline!"));
+    }
+
+}
@@ -0,0 +1,285 @@
+package com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.factory.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+
+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();
+    }
+
+
+    /**
+     * @return The SemanticNode which is directly underneath the document and also under which this node is.
+     * if this is the highest child node or the document itself, it returns itself.
+     */
+    default SemanticNode getHighestParent() {
+
+        return getTableOfContents().getHighestParentById(getTocId());
+    }
+
+
+    /**
+     * 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;
+    }
+
+}
@@ -0,0 +1,92 @@
+package com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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);
+    }
+
+}
@@ -0,0 +1,73 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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();
+    }
+
+}
@@ -0,0 +1,135 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+
+import static java.lang.String.format;
+
+import java.awt.geom.Rectangle2D;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.factory.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+
+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(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(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 Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
+
+        List<Rectangle2D> rectanglesPerLine = stringBoundary.split(getLineBreaks().stream().map(lb -> lb + boundary.start()).filter(stringBoundary::contains).toList())
+                .stream()
+                .map(this::getPositions)
+                .map(RectangleTransformations::rectangleUnion)
+                .toList();
+        Map<PageNode, List<Rectangle2D>> rectanglePerLinePerPage = new HashMap<>();
+        rectanglePerLinePerPage.put(page, rectanglesPerLine);
+        return rectanglePerLinePerPage;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return searchText;
+    }
+
+}
@@ -0,0 +1,179 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+
+import static java.lang.String.format;
+
+import java.awt.geom.Rectangle2D;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ConcatenatedTextBlock implements TextBlock {
+
+    List<AtomicTextBlock> atomicTextBlocks;
+    String searchText;
+    Boundary boundary;
+
+
+    public ConcatenatedTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
+
+        this.atomicTextBlocks = new LinkedList<>();
+        if (atomicTextBlocks.isEmpty()) {
+            boundary = new Boundary(-1, -1);
+            return;
+        }
+        var firstTextBlock = atomicTextBlocks.get(0);
+        this.atomicTextBlocks.add(firstTextBlock);
+        boundary = new Boundary(firstTextBlock.getBoundary().start(), firstTextBlock.getBoundary().end());
+
+        atomicTextBlocks.subList(1, atomicTextBlocks.size()).forEach(this::concat);
+    }
+
+
+    public ConcatenatedTextBlock concat(TextBlock textBlock) {
+
+        if (this.atomicTextBlocks.isEmpty()) {
+            boundary.setStart(textBlock.getBoundary().start());
+            boundary.setEnd(textBlock.getBoundary().end());
+        } else if (boundary.end() != textBlock.getBoundary().start()) {
+            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", boundary, textBlock.getBoundary()));
+        }
+        this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
+        boundary.setEnd(textBlock.getBoundary().end());
+        return this;
+    }
+
+
+    private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
+
+        return atomicTextBlocks.stream().filter(textBlock -> textBlock.getBoundary().contains(stringIdx)).findAny().orElseThrow(IndexOutOfBoundsException::new);
+    }
+
+
+    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(Boundary boundary) {
+
+        return atomicTextBlocks.stream().filter(tb -> tb.getBoundary().intersects(boundary)).toList();
+    }
+
+
+    @Override
+    public String getSearchText() {
+
+        if (searchText == null) {
+            StringBuilder sb = new StringBuilder();
+            getAtomicTextBlocks().forEach(atb -> sb.append(atb.getSearchText()));
+            searchText = sb.toString();
+        }
+        return searchText;
+    }
+
+
+    @Override
+    public int numberOfLines() {
+
+        return atomicTextBlocks.stream().map(AtomicTextBlock::getLineBreaks).mapToInt(List::size).sum();
+    }
+
+
+    @Override
+    public int getNextLinebreak(int fromIndex) {
+
+        return getAtomicTextBlockByStringIndex(fromIndex).getNextLinebreak(fromIndex);
+    }
+
+
+    @Override
+    public int getPreviousLinebreak(int fromIndex) {
+
+        return getAtomicTextBlockByStringIndex(fromIndex).getPreviousLinebreak(fromIndex);
+    }
+
+
+    @Override
+    public List<Integer> getLineBreaks() {
+
+        return getAtomicTextBlocks().stream().flatMap(atomicTextBlock -> atomicTextBlock.getLineBreaks().stream()).toList();
+    }
+
+
+    @Override
+    public Rectangle2D getPosition(int stringIdx) {
+
+        return getAtomicTextBlockByStringIndex(stringIdx).getPosition(stringIdx);
+    }
+
+
+    @Override
+    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).getPositions(stringBoundary);
+        }
+
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end())));
+
+        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
+            positions.addAll(textBlock.getPositions());
+        }
+
+        var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
+        positions.addAll(lastTextBlock.getPositions(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
+
+        return positions;
+    }
+
+
+    @Override
+    public Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary) {
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).getEntityPositionsPerPage(stringBoundary);
+        }
+
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        Map<PageNode, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getEntityPositionsPerPage(new Boundary(stringBoundary.start(),
+                firstTextBlock.getBoundary().end()));
+
+        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
+            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getEntityPositionsPerPage(textBlock.getBoundary()));
+        }
+
+        AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
+        rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, lastTextBlock.getEntityPositionsPerPage(lastTextBlock.getBoundary()));
+
+        return rectanglesPerLinePerPage;
+    }
+
+
+    private Map<PageNode, List<Rectangle2D>> mergeEntityPositionsWithSamePageNode(Map<PageNode, List<Rectangle2D>> map1, Map<PageNode, List<Rectangle2D>> map2) {
+
+        Map<PageNode, List<Rectangle2D>> mergedMap = new HashMap<>(map1);
+        map2.forEach((pageNode, rectangles) -> mergedMap.merge(pageNode, rectangles, (rects1, rects2) -> {
+            rects1.addAll(rects2);
+            return rects1;
+        }));
+        return mergedMap;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return getSearchText();
+    }
+
+}
@@ -0,0 +1,127 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+
+import static java.lang.String.format;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+
+public interface TextBlock extends CharSequence {
+
+    String getSearchText();
+
+
+    List<AtomicTextBlock> getAtomicTextBlocks();
+
+
+    Boundary getBoundary();
+
+
+    int getNextLinebreak(int fromIndex);
+
+
+    int getPreviousLinebreak(int fromIndex);
+
+
+    List<Integer> getLineBreaks();
+
+
+    Rectangle2D getPosition(int stringIdx);
+
+
+    List<Rectangle2D> getPositions(Boundary stringBoundary);
+
+
+    Map<PageNode, List<Rectangle2D>> getEntityPositionsPerPage(Boundary stringBoundary);
+
+
+    int numberOfLines();
+
+
+    default int indexOf(String searchTerm) {
+
+        return indexOf(searchTerm, getBoundary().start());
+    }
+
+
+    default Set<PageNode> getPages() {
+
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getPage).collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    default int indexOf(String searchTerm, int startOffset) {
+
+        int start = getSearchText().indexOf(searchTerm, startOffset - getBoundary().start());
+        if (start == -1) {
+            return -1;
+        }
+        return start + getBoundary().start();
+    }
+
+
+    default CharSequence getFirstLine() {
+
+        return subSequence(getBoundary().start(), getNextLinebreak(getBoundary().start()));
+    }
+
+
+    default boolean containsBoundary(Boundary boundary) {
+
+        if (boundary.end() < boundary.start()) {
+            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", boundary));
+        }
+        return getBoundary().contains(boundary);
+    }
+
+
+    default boolean containsIndex(int stringIndex) {
+
+        return getBoundary().contains(stringIndex);
+    }
+
+
+    default CharSequence subSequence(Boundary boundary) {
+
+        return subSequence(boundary.start(), boundary.end());
+    }
+
+
+    default String buildSummary() {
+
+        String[] words = getSearchText().split(" ");
+        int bound = Math.min(words.length, 4);
+        List<String> list = new ArrayList<>(Arrays.asList(words).subList(0, bound));
+
+        return String.join(" ", list);
+    }
+
+
+    @Override
+    default CharSequence subSequence(int start, int end) {
+
+        return getSearchText().substring(start - getBoundary().start(), end - getBoundary().start());
+    }
+
+
+    @Override
+    default int length() {
+
+        return getBoundary().length();
+    }
+
+
+    @Override
+    default char charAt(int index) {
+
+        return getSearchText().charAt(index - getBoundary().start());
+    }
+
+}
@@ -0,0 +1,50 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+
+import java.util.Collections;
+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 lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class TextBlockCollector implements Collector<TextBlock, ConcatenatedTextBlock, TextBlock> {
+
+    @Override
+    public Supplier<ConcatenatedTextBlock> supplier() {
+
+        return () -> new ConcatenatedTextBlock(Collections.emptyList());
+    }
+
+
+    @Override
+    public BiConsumer<ConcatenatedTextBlock, TextBlock> accumulator() {
+
+        return ConcatenatedTextBlock::concat;
+    }
+
+
+    @Override
+    public BinaryOperator<ConcatenatedTextBlock> combiner() {
+
+        return ConcatenatedTextBlock::concat;
+    }
+
+
+    @Override
+    public Function<ConcatenatedTextBlock, TextBlock> finisher() {
+
+        return a -> a;
+    }
+
+
+    @Override
+    public Set<Characteristics> characteristics() {
+
+        return Set.of(Characteristics.IDENTITY_FINISH, Characteristics.CONCURRENT);
+    }
+
+}
@@ -0,0 +1,146 @@
+package com.iqser.red.service.redaction.v1.server.document.mapper;
+
+import java.awt.geom.Rectangle2D;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.document.data.AtomicPositionBlockData;
+import com.iqser.red.service.redaction.v1.server.document.data.AtomicTextBlockData;
+import com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.document.data.PageData;
+import com.iqser.red.service.redaction.v1.server.document.data.TableOfContentsData;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCellNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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;
+    }
+
+}
@@ -0,0 +1,224 @@
+package com.iqser.red.service.redaction.v1.server.document.mapper;
+
+import static com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType.FOOTER;
+import static com.iqser.red.service.redaction.v1.server.document.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.iqser.red.service.redaction.v1.server.document.data.AtomicPositionBlockData;
+import com.iqser.red.service.redaction.v1.server.document.data.AtomicTextBlockData;
+import com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.document.data.PageData;
+import com.iqser.red.service.redaction.v1.server.document.data.TableOfContentsData;
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentGraph;
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.FooterNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.HeaderNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.HeadlineNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ParagraphNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SectionNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCellNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.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) {
+
+    }
+
+}
@@ -0,0 +1,89 @@
+package com.iqser.red.service.redaction.v1.server.document.mapper;
+
+import static com.iqser.red.service.redaction.v1.server.document.graph.factory.RectangleTransformations.parseRectangle2D;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.factory.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCellNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableNode;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+
+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()));
+        properties.put("id", image.getId());
+        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")));
+        builder.id(properties.get("id"));
+    }
+
+
+    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")));
+    }
+
+
+    public 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;
+        };
+    }
+
+}
@@ -0,0 +1,59 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
+public class CharSequenceSearchUtils {
+
+    public static boolean anyMatch(CharSequence charSequence, String regexPattern) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        return pattern.matcher(charSequence).find();
+    }
+
+
+    public static boolean anyMatch(TextBlock textBlock, String regexPattern) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        return pattern.matcher(textBlock).region(textBlock.getBoundary().start(), textBlock.getBoundary().end()).find();
+    }
+
+
+    public static Boundary findFirstBoundary(String regexPattern, CharSequence searchText) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        Matcher matcher = pattern.matcher(searchText);
+        return new Boundary(matcher.start(), matcher.end());
+    }
+
+
+    public static List<Boundary> findBoundariesByRegex(String regexPattern, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        Matcher matcher = pattern.matcher(textBlock.subSequence(textBlock.getBoundary()));
+        List<Boundary> boundaries = new LinkedList<>();
+        while (matcher.find()) {
+            boundaries.add(new Boundary(matcher.start() + textBlock.getBoundary().start(), matcher.end() + textBlock.getBoundary().start()));
+        }
+        return boundaries.stream().filter(boundary -> boundaryIsSurroundedBySeparators(textBlock, boundary)).toList();
+    }
+
+
+    public static List<Boundary> findBoundariesByString(String searchString, TextBlock textBlock) {
+
+        List<Boundary> boundaries = new LinkedList<>();
+        for (int index = textBlock.indexOf(searchString); index >= 0; index = textBlock.indexOf(searchString, index + 1)) {
+            boundaries.add(new Boundary(index, index + searchString.length()));
+        }
+        return boundaries;
+    }
+
+}
@@ -0,0 +1,208 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import static com.iqser.red.service.redaction.v1.server.document.services.CharSequenceSearchUtils.findBoundariesByString;
+import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
+import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.isWhiteSpacesOrSeparatorsOnly;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class EntityCreationService {
+
+    private final EntityEnrichmentService entityEnrichmentService;
+
+
+    public Set<EntityNode> betweenStrings(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.buildTextBlock();
+        List<Boundary> startBoundaries = findBoundariesByString(start, textBlock);
+        List<Boundary> stopBoundaries = findBoundariesByString(stop, textBlock);
+
+        List<Boundary> entityBoundaries = new LinkedList<>();
+        if (startBoundaries.isEmpty() || stopBoundaries.isEmpty()) {
+            return Collections.emptySet();
+        }
+        for (Boundary startBoundary : startBoundaries) {
+            Optional<Boundary> optionalFirstStopBoundary = stopBoundaries.stream().filter(stopBoundary -> stopBoundary.end() > startBoundary.start()).findFirst();
+            if (optionalFirstStopBoundary.isEmpty()) {
+                break;
+            }
+            stopBoundaries.remove(optionalFirstStopBoundary.get());
+            entityBoundaries.add(new Boundary(startBoundary.end(), optionalFirstStopBoundary.get().start()));
+        }
+        return entityBoundaries.stream()
+                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    public Set<EntityNode> bySearchImplementation(SearchImplementation searchImplementation, String type, EntityType entityType, SemanticNode node) {
+
+        return searchImplementation.getBoundaries(node.buildTextBlock(), node.getBoundary())
+                .stream()
+                .filter(boundary -> isValidEntityBoundary(node.buildTextBlock(), boundary))
+                .map(bounds -> byBoundary(bounds, type, entityType, node))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    public Set<EntityNode> lineAfterStrings(List<String> strings, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.buildTextBlock();
+        SearchImplementation searchImplementation = new SearchImplementation(strings, false);
+        return searchImplementation.getBoundaries(textBlock, node.getBoundary())
+                .stream()
+                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
+                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    public Set<EntityNode> lineAfterString(String string, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.buildTextBlock();
+        List<Boundary> boundaries = findBoundariesByString(string, textBlock);
+        return boundaries.stream()
+                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
+                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    public Set<EntityNode> byRegex(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> boundaries = CharSequenceSearchUtils.findBoundariesByRegex(regexPattern, node.buildTextBlock());
+        return boundaries.stream().map(boundary -> byBoundary(boundary, type, entityType, node)).collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    public EntityNode bySemanticNode(SemanticNode node, String type, EntityType entityType) {
+
+        Boundary boundary = node.buildTextBlock().getBoundary();
+        Boundary nodeBoundaryWithoutTrailingWhitespace = new Boundary(boundary.start(), boundary.end() - 1);
+        return byBoundary(nodeBoundaryWithoutTrailingWhitespace, type, entityType, node);
+    }
+
+
+    public EntityNode byBoundary(Boundary boundary, String type, EntityType entityType, SemanticNode node) {
+
+        EntityNode entity = EntityNode.initialEntityNode(boundary, type, entityType);
+        addEntityToGraph(entity, node.getTableOfContents());
+        return entity;
+    }
+
+
+    public EntityNode byEntities(List<EntityNode> entitiesToMerge, String type, EntityType entityType, SemanticNode node) {
+
+        if (!allEntitiesIntersectAndHaveSameTypes(entitiesToMerge)) {
+            throw new IllegalArgumentException("Provided entities can not be merged!");
+        }
+        if (entitiesToMerge.size() < 2) {
+            throw new IllegalArgumentException("more than 2 entities are required to merge!");
+        }
+
+        EntityNode mergedEntity = EntityNode.initialEntityNode(Boundary.merge(entitiesToMerge.stream().map(EntityNode::getBoundary).toList()), type, entityType);
+        mergedEntity.setRedaction(entitiesToMerge.stream().anyMatch(EntityNode::isRedaction));
+        mergedEntity.addEngines(entitiesToMerge.stream().flatMap(entityNode -> entityNode.getEngines().stream()).collect(Collectors.toSet()));
+        EntityNode entityWithHigherRuleNumber = entitiesToMerge.stream().max(Comparator.comparingInt(EntityNode::getMatchedRule)).orElse(entitiesToMerge.get(0));
+        mergedEntity.setRedactionReason(entityWithHigherRuleNumber.getRedactionReason());
+        mergedEntity.setMatchedRule(entityWithHigherRuleNumber.getMatchedRule());
+        mergedEntity.setLegalBasis(entityWithHigherRuleNumber.getLegalBasis());
+
+        addEntityToGraph(mergedEntity, node.getTableOfContents());
+        return mergedEntity;
+    }
+
+
+    public boolean isValidEntityBoundary(TextBlock textBlock, Boundary boundary) {
+
+        return boundaryIsSurroundedBySeparators(textBlock, boundary) && !isWhiteSpacesOrSeparatorsOnly(textBlock, boundary);
+    }
+
+
+    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));
+    }
+
+
+    private static boolean allEntitiesIntersectAndHaveSameTypes(List<EntityNode> entitiesToMerge) {
+
+        if (entitiesToMerge.isEmpty()) {
+            return true;
+        }
+        EntityNode previousEntity = entitiesToMerge.get(0);
+        for (EntityNode entityNode : entitiesToMerge.subList(1, entitiesToMerge.size())) {
+            boolean typeMatches = entityNode.getType().equals(previousEntity.getType());
+            boolean entityTypeMatches = entityNode.getEntityType().equals(previousEntity.getEntityType());
+            boolean intersects = entityNode.intersects(previousEntity);
+            if (!typeMatches || !entityTypeMatches || !intersects) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    private static Boundary toLineAfterBoundary(TextBlock textBlock, Boundary boundary) {
+
+        return new Boundary(boundary.end(), textBlock.getNextLinebreak(boundary.end()));
+    }
+
+}
@@ -0,0 +1,116 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EntityEnrichmentService {
+
+    private final RedactionServiceSettings redactionServiceSettings;
+
+
+    public void enrichEntity(EntityNode entity, TextBlock textBlock) {
+
+        entity.setValue(textBlock.subSequence(entity.getBoundary()).toString());
+        entity.setTextAfter(findTextAfter(entity.getBoundary().end(), textBlock));
+        entity.setTextBefore(findTextBefore(entity.getBoundary().start(), textBlock));
+    }
+
+
+    private CharSequence findTextAfter(int index, TextBlock textBlock) {
+
+        int endOffset = Math.min(index + redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getBoundary().end());
+        String textAfter = textBlock.subSequence(index, endOffset).toString();
+        if (!textAfter.isBlank()) {
+            List<String> wordsAfter = splitToWordsAndRemoveEmptyWords(textAfter);
+            int numberOfWordsAfter = Math.min(wordsAfter.size(), redactionServiceSettings.getNumberOfSurroundingWords());
+            if (wordsAfter.size() > 0) {
+                return concatWordsAfter(wordsAfter.subList(0, numberOfWordsAfter), textAfter.startsWith(" "));
+            }
+        }
+        return "";
+    }
+
+
+    private CharSequence findTextBefore(int index, TextBlock textBlock) {
+
+        int offsetBefore = Math.max(index - redactionServiceSettings.getSurroundingWordsOffsetWindow(), textBlock.getBoundary().start());
+        String textBefore = textBlock.subSequence(offsetBefore, index).toString();
+        if (!textBefore.isBlank()) {
+            List<String> wordsBefore = splitToWordsAndRemoveEmptyWords(textBefore);
+            int numberOfWordsBefore = Math.min(wordsBefore.size(), redactionServiceSettings.getNumberOfSurroundingWords());
+            if (wordsBefore.size() > 0) {
+                return concatWordsBefore(wordsBefore.subList(wordsBefore.size() - numberOfWordsBefore, wordsBefore.size()), textBefore.endsWith(" "));
+            }
+        }
+        return "";
+    }
+
+
+    private static List<String> splitToWordsAndRemoveEmptyWords(String textAfter) {
+
+        return Arrays.stream(textAfter.split(" ")).filter(word -> !Objects.equals("", word)).toList();
+    }
+
+
+    private static String concatWordsBefore(List<String> words, boolean endWithSpace) {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String word : words) {
+            sb.append(word).append(" ");
+        }
+
+        String result = sb.toString().trim();
+        return endWithSpace ? result + " " : result;
+    }
+
+
+    private static String concatWordsAfter(List<String> words, boolean startWithSpace) {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (String word : words) {
+            sb.append(word).append(" ");
+        }
+
+        String result = sb.toString().trim();
+        return startWithSpace ? " " + result : result;
+    }
+
+
+    public static void setFields(EntityNode entityNode, int matchedRule, String redactionReason, String legalBasis, Engine engine) {
+
+        if (entityNode.getMatchedRule() == -1 && matchedRule != -1) {
+            entityNode.setMatchedRule(matchedRule);
+        }
+        if (entityNode.getRedactionReason().equals("") && redactionReason != null) {
+            entityNode.setRedactionReason(redactionReason);
+        }
+        if (entityNode.getLegalBasis().equals("") && legalBasis != null) {
+            entityNode.setLegalBasis(legalBasis);
+        }
+        if (engine != null) {
+            entityNode.addEngine(engine);
+        }
+    }
+
+
+    public static void setFields(Collection<EntityNode> entityNodes, int matchedRule, String redactionReason, String legalBasis, Engine engine) {
+
+        entityNodes.forEach(entityNode -> setFields(entityNode, matchedRule, redactionReason, legalBasis, engine));
+    }
+
+}
@@ -0,0 +1,45 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import java.util.NoSuchElementException;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
+import com.iqser.red.service.redaction.v1.server.document.graph.factory.RectangleTransformations;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class ManualRedactionApplicationService {
+
+    private final EntityCreationService entityCreationService;
+
+
+    public void resizeEntityAndReinsert(EntityNode entityToBeResized, ManualResizeRedaction manualResizeRedaction) {
+
+        RedactionPosition redactionPositionToBeResized = entityToBeResized.getRedactionPositionsPerPage()
+                .stream()
+                .filter(redactionPosition -> redactionPosition.getId().equals(manualResizeRedaction.getValue()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException("No redaction position with matching annotation id found!"));
+
+        redactionPositionToBeResized.setRectanglePerLine(manualResizeRedaction.getPositions().stream().map(RectangleTransformations::toRectangle2D).toList());
+
+        int newStartOffset;
+        if (manualResizeRedaction.getValue().length() > entityToBeResized.getValue().length()) {
+            newStartOffset = entityToBeResized.getBoundary().start() - manualResizeRedaction.getValue().indexOf(entityToBeResized.getValue());
+        } else {
+            newStartOffset = entityToBeResized.getBoundary().start() + entityToBeResized.getValue().indexOf(manualResizeRedaction.getValue());
+        }
+
+        entityToBeResized.setResized(true);
+        entityToBeResized.getBoundary().setStart(newStartOffset);
+        entityToBeResized.getBoundary().setEnd(newStartOffset + manualResizeRedaction.getValue().length());
+        entityToBeResized.removeFromGraph();
+        entityCreationService.addEntityToGraph(entityToBeResized, entityToBeResized.getDeepestFullyContainingNode().getTableOfContents());
+    }
+
+}
--- a/Show More
+++ b/Show More