Merge branch 'renovate/master-com.iqser.red.commons-dictionary-merge-commons-1.x' into 'master'

fix(deps): update dependency com.iqser.red.commons:dictionary-merge-commons to v1.5.0 (master) See merge request redactmanager/redaction-service!66
fix(deps): update dependency com.iqser.red.commons:dictionary-merge-commons to v1.5.0 (master)
2023-08-02 03:06:29 +02:00 · 2023-08-02 03:06:29 +02:00 · 2023-08-02 00:06:25 +02:00 · 2023-08-02 00:06:25 +02:00 · 2023-08-01 21:06:53 +02:00 · 2023-08-01 21:06:53 +02:00
315 changed files with 51957 additions and 49679 deletions
@@ -9,6 +9,49 @@
 **/tmp/
 **/.apt_generated/

+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### maven build ###
+*.class
+/out/
+/build/
+/target/
+**/out/
+**/build/
+**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+.gradle
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

 .factorypath
 .springBeans
@@ -0,0 +1,6 @@
+variables:
+  SONAR_PROJECT_KEY: 'RED_redaction-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/gradle_java.yml'
@@ -1,37 +0,0 @@
-<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>
-
-    <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>
-
-    <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>
-
-
-    <!-- run 'mvn test' to perform offline validation of the plan -->
-    <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>
@@ -1,156 +0,0 @@
-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;
-import com.atlassian.bamboo.specs.api.builders.permission.PlanPermissions;
-import com.atlassian.bamboo.specs.api.builders.plan.Job;
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.builders.plan.PlanIdentifier;
-import com.atlassian.bamboo.specs.api.builders.plan.Stage;
-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;
-
-/**
- * Plan configuration for Bamboo.
- * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
- */
-@BambooSpec
-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) {
-        //By default credentials are read from the '.credentials' file.
-        BambooServer bambooServer = new BambooServer("http://localhost:8085");
-
-        Plan plan = new PlanSpec().createPlan();
-        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("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"));
-    }
-
-
-    public Plan createPlan() {
-
-        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))
-                        .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());
-    }
-
-}
@@ -1,65 +0,0 @@
-#!/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
@@ -1,45 +0,0 @@
-#!/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,24 +0,0 @@
-package buildjob;
-
-import org.junit.Test;
-
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-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();
-        EntityPropertiesBuilders.build(plan);
-
-        Plan nightPlan = new PlanSpec().createNightPlan();
-        EntityPropertiesBuilders.build(nightPlan);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        EntityPropertiesBuilders.build(secPlan);
-    }
-
-}
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
@@ -0,0 +1,75 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    pmd
+    checkstyle
+    jacoco
+}
+
+group = "com.iqser.red"
+
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
+
+tasks.pmdMain {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/test_pmd.xml")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+    reports {
+        junitXml.outputLocation.set(layout.buildDirectory.dir("reports/junit"))
+    }
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+    }
+}
+
+allprojects {
+    publishing {
+        publications {
+            create<MavenPublication>(name) {
+                from(components["java"])
+            }
+        }
+        repositories {
+            maven {
+                url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
+                credentials {
+                    username = providers.gradleProperty("mavenUser").getOrNull();
+                    password = providers.gradleProperty("mavenPassword").getOrNull();
+                }
+            }
+        }
+    }
+}
+
+java {
+    withJavadocJar()
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/gindev/");
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull();
+            password = providers.gradleProperty("mavenPassword").getOrNull();
+        }
+    }
+}
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property
+            name="severity"
+            value="error"/>
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+        <module name="AnnotationLocation"/>
+        <module name="JavadocStyle"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="EmptyBlock"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExplicitInitialization"/>
+        <module name="IllegalInstantiation"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="PackageDeclaration"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="OneStatementPerLine"/>
+        <module name="FinalClass"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+        <module name="OuterTypeFilename"/>
+    </module>
+    <module name="FileTabCharacter"/>
+    <module name="SuppressWarningsFilter"/>
+</module>
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon ruleset checks the code for bad stuff
+    </description>
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AssignmentInOperand"/>
+    </rule>
+
+</ruleset>
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon test ruleset checks the code for bad stuff
+    </description>
+
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="TestClassWithoutTestCases"/>
+    </rule>
+
+</ruleset>
@@ -0,0 +1 @@
+version = 4.0-SNAPSHOT
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>redaction-service</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>4.0-SNAPSHOT</version>
-
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bamboo-specs</module>
-        <module>redaction-service-v1</module>
-        <module>redaction-service-image-v1</module>
-    </modules>
-
-</project>
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.iqser.red</groupId>
-        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>redaction-service-image-v1</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-
-    <properties>
-        <service.server>redaction-service-server-v1</service.server>
-        <platform.jar>${service.server}.jar</platform.jar>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.image.name>${docker.image.prefix}/${service.server}</docker.image.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>download-platform-jar</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <dependency>
-                                        <groupId>${project.groupId}</groupId>
-                                        <artifactId>${service.server}</artifactId>
-                                        <version>${project.version}</version>
-                                        <type>jar</type>
-                                        <overWrite>true</overWrite>
-                                        <destFileName>${platform.jar}</destFileName>
-                                    </dependency>
-                                </artifactItems>
-                                <outputDirectory>${docker.build.directory}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <images>
-                            <image>
-                                <name>${docker.image.name}</name>
-                                <build>
-                                    <dockerFileDir>${docker.build.directory}</dockerFileDir>
-                                    <args>
-                                        <PLATFORM_JAR>${platform.jar}</PLATFORM_JAR>
-                                    </args>
-                                    <tags>
-                                        <tag>${docker.image.version}</tag>
-                                        <tag>latest</tag>
-                                    </tags>
-                                </build>
-                            </image>
-                        </images>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
@@ -1,9 +0,0 @@
-FROM red/redaction-service-base-v1:2.0.0
-
-ARG PLATFORM_JAR
-
-ENV PLATFORM_JAR ${PLATFORM_JAR}
-
-ENV USES_ELASTICSEARCH false
-
-COPY ["${PLATFORM_JAR}", "/"]
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>platform-dependency</artifactId>
-        <groupId>com.iqser.red</groupId>
-        <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>
-
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>redaction-service-api-v1</module>
-        <module>redaction-service-server-v1</module>
-    </modules>
-
-    <properties>
-        <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.22.0</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox-tools</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <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>
@@ -0,0 +1,14 @@
+
+plugins {
+    id("com.iqser.red.service.java-conventions")
+    id("io.freefair.lombok") version "8.1.0"
+}
+
+description = "redaction-service-api-v1"
+
+dependencies {
+    implementation("org.springframework:spring-web:6.0.11")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:RED-6725")
+}
+
+
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>redaction-service-v1</artifactId>
-        <groupId>com.iqser.red.service</groupId>
-        <version>1.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>
@@ -0,0 +1,90 @@
+import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
+
+plugins {
+    application
+    id("com.iqser.red.service.java-conventions")
+    id("org.springframework.boot") version "3.0.6"
+    id("io.spring.dependency-management") version "1.1.2"
+    id("org.sonarqube") version "4.3.0.3225"
+    id("io.freefair.lombok") version "8.1.0"
+}
+
+description = "redaction-service-server-v1"
+
+
+val layoutParserVersion = "0.18.0"
+val jacksonVersion = "2.14.2"
+val droolsVersion = "8.37.0.Final"
+val pdfBoxVersion = "3.0.0-alpha2"
+
+configurations {
+    all {
+        exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging")
+    }
+}
+
+dependencies {
+
+    implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") }
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.119.0") { exclude(group = "org.springframework.boot") }
+    implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
+
+    implementation("com.iqser.red.commons:spring-commons:2.1.0")
+    implementation("com.iqser.red.commons:metric-commons:2.1.0")
+
+    implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0")
+    implementation("com.iqser.red.commons:storage-commons:2.1.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.10.0")
+
+    implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
+    implementation("org.ahocorasick:ahocorasick:0.6.3")
+    implementation("org.javassist:javassist:3.29.2-GA")
+
+    implementation("org.drools:drools-engine:${droolsVersion}")
+    implementation("org.drools:drools-mvel:${droolsVersion}")
+    implementation("org.kie:kie-spring:7.73.0.Final")
+
+    implementation("org.locationtech.jts:jts-core:1.19.0")
+
+    implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
+    implementation("org.springframework.boot:spring-boot-starter-amqp:3.0.4")
+
+    testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
+    testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test:3.0.4")
+    testImplementation("com.knecon.fforesight:layoutparser-service-processor:${layoutParserVersion}") {
+        exclude(
+            group = "com.iqser.red.service",
+            module = "persistence-service-shared-api-v1"
+        )
+    }
+}
+
+tasks.test {
+    configure<JacocoTaskExtension> {
+        excludes = listOf("org/drools/**/*")
+    }
+}
+
+
+tasks.named<BootBuildImage>("bootBuildImage") {
+    imageName.set("nexus.knecon.com:5001/red/${project.name}:${project.version}")
+    if (project.hasProperty("buildbootDockerHostNetwork")) {
+        network.set("host")
+    }
+    docker {
+        if (project.hasProperty("buildbootDockerHostNetwork")) {
+            bindHostToBuilder.set(true)
+        }
+        verboseLogging.set(true)
+
+        publishRegistry {
+            username.set(providers.gradleProperty("mavenUser").getOrNull())
+            password.set(providers.gradleProperty("mavenPassword").getOrNull())
+            email.set(providers.gradleProperty("mavenEmail").getOrNull())
+            url.set("https://nexus.knecon.com:5001/")
+        }
+    }
+}
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>redaction-service-v1</artifactId>
-        <groupId>com.iqser.red.service</groupId>
-        <version>1.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>org.drools</groupId>
-            <artifactId>drools-core</artifactId>
-            <version>${drools.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.kie</groupId>
-            <artifactId>kie-spring</artifactId>
-            <version>${kie.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.locationtech.jts</groupId>
-            <artifactId>jts-core</artifactId>
-            <version>${locationtech.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <!-- commons -->
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>spring-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>logging-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>metric-commons</artifactId>
-        </dependency>
-        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox-tools</artifactId>
-        </dependency>
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>test-commons</artifactId>
-            <scope>test</scope>
-        </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>
-
-            <plugin>
-                <!-- generate git.properties for exposure in /info -->
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <configuration>
-                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                            <gitDescribe>
-                                <tags>true</tags>
-                            </gitDescribe>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>original-jar</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <classifier>original</classifier>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- repackages the generated jar into a runnable fat-jar and makes it
-                    executable -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <executable>true</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server;

 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -9,17 +10,17 @@ 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.dictionarymerge.commons.DictionaryMergeService;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-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 com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;

 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;

-@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MultiTenancyMessagingConfiguration.class})
+@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
+@Import({MetricsConfiguration.class, StorageAutoConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
@@ -38,4 +39,10 @@ public class Application {
        return new TimedAspect(registry);
    }

+    @Bean
+    public DictionaryMergeService dictionaryMergeService() {
+
+        return new DictionaryMergeService();
+    }
+
 }
@@ -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,31 +0,0 @@
-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.section.SectionGrid;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class Document {
-
-    private List<Page> pages = new ArrayList<>();
-    private List<Paragraph> paragraphs = 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 StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
-    private boolean headlines;
-
-    private SectionGrid sectionGrid = new SectionGrid();
-    private DictionaryVersion dictionaryVersion;
-    private long rulesVersion;
-
-}
@@ -1,77 +0,0 @@
-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;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class FloatFrequencyCounter {
-
-    @Getter
-    Map<Float, Integer> countPerValue = new HashMap<>();
-
-
-    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());
-            } else {
-                countPerValue.put(entry.getKey(), entry.getValue());
-            }
-        }
-    }
-
-
-    public Float getMostPopular() {
-
-        Map.Entry<Float, Integer> mostPopular = null;
-        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
-                mostPopular = entry;
-            }
-        }
-        return mostPopular != null ? mostPopular.getKey() : null;
-    }
-
-
-    public List<Float> getHighterThanMostPopular() {
-
-        Float mostPopular = getMostPopular();
-        List<Float> higher = new ArrayList<>();
-        for (Float value : countPerValue.keySet()) {
-            if (value > mostPopular) {
-                higher.add(value);
-            }
-        }
-
-        return higher.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
-    }
-
-
-    public Float getHighest() {
-
-        Float highest = null;
-        for (Float value : countPerValue.keySet()) {
-            if (highest == null || value > highest) {
-                highest = value;
-            }
-        }
-        return highest;
-    }
-
-}
@@ -1,28 +0,0 @@
-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;
-    }
-
-}
@@ -1,28 +0,0 @@
-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;
-    }
-
-}
@@ -1,8 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-public enum Orientation {
-
-    NONE,
-    LEFT,
-    RIGHT
-}
@@ -1,44 +0,0 @@
-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 lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@RequiredArgsConstructor
-public class Page {
-
-    @NonNull
-    private List<AbstractTextContainer> textBlocks;
-
-    private List<PdfImage> images = new ArrayList<>();
-
-    private Rectangle bodyTextFrame;
-
-    private boolean landscape;
-    private int rotation;
-
-    private int pageNumber;
-
-    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
-    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
-    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
-
-    private float pageWidth;
-    private float pageHeight;
-
-
-    public boolean isRotated() {
-
-        return rotation != 0;
-    }
-
-}
@@ -1,65 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-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;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-public class Paragraph implements Comparable {
-
-    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
-    private List<PdfImage> images = new ArrayList<>();
-    private String headline;
-
-
-    public SearchableText getSearchableText() {
-
-        SearchableText searchableText = new SearchableText();
-        pageBlocks.forEach(block -> {
-            if (block instanceof TextBlock) {
-                searchableText.addAll(((TextBlock) block).getSequences());
-            }
-        });
-        return searchableText;
-    }
-
-
-    public List<Table> getTables() {
-
-        List<Table> tables = new ArrayList<>();
-        pageBlocks.forEach(block -> {
-            if (block instanceof Table) {
-                tables.add((Table) block);
-            }
-        });
-        return tables;
-    }
-
-
-    public List<TextBlock> getTextBlocks() {
-
-        List<TextBlock> textBlocks = new ArrayList<>();
-        pageBlocks.forEach(block -> {
-            if (block instanceof TextBlock) {
-                textBlocks.add((TextBlock) block);
-            }
-        });
-        return textBlocks;
-    }
-
-
-    @Override
-    public int compareTo(Object o) {
-
-        return 0;
-    }
-
-}
@@ -1,63 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-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;
-
-import java.util.*;
-
-@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;
-    }
-
-}
@@ -1,20 +0,0 @@
-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;
-
-}
@@ -1,23 +0,0 @@
-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,47 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import lombok.Getter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class StringFrequencyCounter {
-
-    @Getter
-    private final Map<String, Integer> countPerValue = new HashMap<>();
-
-
-    public void add(String value) {
-
-        if (!countPerValue.containsKey(value)) {
-            countPerValue.put(value, 1);
-        } else {
-            countPerValue.put(value, countPerValue.get(value) + 1);
-        }
-    }
-
-
-    public void addAll(Map<String, Integer> otherCounter) {
-
-        for (Map.Entry<String, 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 String getMostPopular() {
-
-        Map.Entry<String, Integer> mostPopular = null;
-        for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
-                mostPopular = entry;
-            }
-        }
-        return mostPopular != null ? mostPopular.getKey() : null;
-    }
-
-}
@@ -1,21 +0,0 @@
-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<>();
-
-}
@@ -1,313 +0,0 @@
-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.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;
-
-    @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;
-
-
-    @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) {
-
-        this.minX = minX;
-        this.maxX = maxX;
-        this.minY = minY;
-        this.maxY = maxY;
-        this.sequences = sequences;
-        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();
-        }
-        if (r.getMaxX() > maxX) {
-            maxX = r.getMaxX();
-        }
-        if (r.getMinY() < minY) {
-            minY = r.getMinY();
-        }
-        if (r.getMaxY() > maxY) {
-            maxY = r.getMaxY();
-        }
-        sequences.addAll(r.getSequences());
-    }
-
-
-    public void add(TextPositionSequence r) {
-
-        if (r.getMinXDirAdj() < minX) {
-            minX = r.getMinXDirAdj();
-        }
-        if (r.getMaxXDirAdj() > maxX) {
-            maxX = r.getMaxXDirAdj();
-        }
-        if (r.getMinYDirAdj() < minY) {
-            minY = r.getMinYDirAdj();
-        }
-        if (r.getMaxYDirAdj() > maxY) {
-            maxY = r.getMaxYDirAdj();
-        }
-    }
-
-
-    public TextBlock copy() {
-
-        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation);
-    }
-
-
-    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);
-        this.maxY = Math.max(y1, y2);
-    }
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < sequences.size(); i++) {
-            String sequenceAsString = sequences.get(i).toString();
-            // Fix for missing Whitespace. This is recognized in getSequences method. See PDFTextStripper Line 1730.
-            if (i != 0 && sequences.get(i - 1).charAt(sequences.get(i - 1).length() - 1) != ' ' && sequenceAsString.charAt(0) != ' ') {
-                builder.append(' ');
-            }
-            builder.append(sequenceAsString);
-        }
-
-        return builder.toString();
-
-    }
-
-
-    @Override
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public String getText() {
-
-        StringBuilder sb = new StringBuilder();
-
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
-            if (previous != null) {
-                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
-                }
-            }
-            sb.append(word.toString());
-            previous = word;
-        }
-
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
-
-    }
-
-}
@@ -1,28 +0,0 @@
-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,241 +0,0 @@
-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.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.Ruling;
-
-@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) {
-
-        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 = 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 || splitByX || splitByDir || isSplitByRuling)) {
-
-                Orientation prevOrientation = null;
-                if (!chunkBlockList1.isEmpty()) {
-                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
-                }
-
-                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;
-                maxY = 0;
-                prev = null;
-            }
-
-            chunkWords.add(word);
-
-            prev = word;
-            if (word.getMinXDirAdj() < minX) {
-                minX = word.getMinXDirAdj();
-            }
-            if (word.getMaxXDirAdj() > maxX) {
-                maxX = word.getMaxXDirAdj();
-            }
-            if (word.getMinYDirAdj() < minY) {
-                minY = word.getMinYDirAdj();
-            }
-            if (word.getMaxYDirAdj() > maxY) {
-                maxY = word.getMaxYDirAdj();
-            }
-        }
-
-        TextBlock cb1 = buildTextBlock(chunkWords);
-        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 boolean equalsWithThreshold(float f1, float f2) {
-
-        return Math.abs(f1 - f2) < THRESHOLD;
-    }
-
-
-    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {
-
-        TextBlock textBlock = null;
-
-        FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
-        StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
-        StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
-
-        for (TextPositionSequence wordBlock : wordBlockList) {
-
-            lineHeightFrequencyCounter.add(wordBlock.getTextHeight());
-            fontSizeFrequencyCounter.add(wordBlock.getFontSize());
-            spaceFrequencyCounter.add(wordBlock.getSpaceWidth());
-            fontFrequencyCounter.add(wordBlock.getFont());
-            styleFrequencyCounter.add(wordBlock.getFontStyle());
-
-            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getMinXDirAdj(), wordBlock.getMaxXDirAdj(), wordBlock.getMinYDirAdj(), wordBlock.getMaxYDirAdj(), wordBlockList, wordBlock.getRotation());
-            } else {
-                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
-            }
-        }
-
-        if (textBlock != null) {
-            textBlock.setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
-            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 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) {
-            var line = RulingTextDirAdjustUtil.convertToDirAdj(ruling, dir, pageWidth, pageHeight);
-            if (line.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    private double round(float value, int decimalPoints) {
-
-        var d = Math.pow(10, decimalPoints);
-        return Math.round(value * d) / d;
-    }
-
-}
@@ -1,161 +0,0 @@
-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;
-
-    }
-
-}
@@ -1,116 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.service;
-
-import java.util.List;
-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 lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ClassificationService {
-
-    private final BodyTextFrameService bodyTextFrameService;
-
-
-    public void classifyDocument(Document document) {
-
-        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()) {
-            bodyTextFrameService.setBodyTextFrameAdjustedToPage(page, bodyTextFrame, landscapeBodyTextFrame);
-            classifyPage(page, document, headlineFontSizes);
-        }
-    }
-
-
-    public void classifyPage(Page page, Document document, List<Float> headlineFontSizes) {
-
-        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
-            if (textBlock instanceof TextBlock) {
-                classifyBlock((TextBlock) textBlock, page, document, headlineFontSizes);
-            }
-        }
-    }
-
-
-    public void classifyBlock(TextBlock textBlock, Page page, Document document, List<Float> headlineFontSizes) {
-
-        var bodyTextFrame = page.getBodyTextFrame();
-
-        if (document.getFontSizeCounter().getMostPopular() == null) {
-            textBlock.setClassification("Other");
-            return;
-        }
-        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, page.getRotation()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
-            textBlock.setClassification("Footer");
-        } 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 (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)) {
-                    textBlock.setClassification("H " + i);
-                    document.setHeadlines(true);
-                }
-            }
-        } 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 && 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")) {
-            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()) {
-            textBlock.setClassification("TextBlock");
-        } 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,119 +0,0 @@
-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 lombok.experimental.UtilityClass;
-
-@UtilityClass
-@SuppressWarnings("all")
-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) {
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        double threshold = textBlock.getMostPopularWordHeight() * 3;
-
-        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;
-        }
-
-    }
-
-
-    // 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 (rotation == 90 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
-            return true;
-        }
-
-        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;
-        }
-
-    }
-
-    // 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 (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;
-        }
-
-    }
-
-    // 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.
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        if (textBlock.getMinY() < btf.getTopLeft().getY()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    public float getHeightDifferenceBetweenChunkWordAndDocumentWord(TextBlock textBlock, Float documentMostPopularWordHeight) {
-
-        return textBlock.getMostPopularWordHeight() - documentMostPopularWordHeight;
-    }
-
-
-    public Float getApproxLineCount(TextBlock textBlock) {
-
-        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
-    }
-
-}
@@ -1,64 +0,0 @@
-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;
-    }
-
-}
@@ -1,10 +0,0 @@
-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 {
-
-}
@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.client.model;

-import com.dslplatform.json.CompiledJson;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -9,10 +8,9 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
-public class EntityRecogintionEntity {
+public class EntityRecognitionEntity {

    private String value;
    private int startOffset;
@@ -4,18 +4,15 @@ 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 {
+public class NerEntitiesModel {

-    private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
+    private Map<Integer, List<EntityRecognitionEntity>> data = new HashMap<>();

 }
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.controller;

+import org.springframework.web.bind.annotation.RestController;
+
 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 com.iqser.red.service.redaction.v1.server.redaction.service.RuleBuilderModelService;

 import lombok.RequiredArgsConstructor;

-import org.springframework.web.bind.annotation.RestController;
-
@RestController
@RequiredArgsConstructor
 public class RuleBuilderController implements RuleBuilderResource {
@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.server.document.data;
+
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
+
+import 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 {
+
+    DocumentPage[] documentPages;
+    DocumentTextData[] documentTextData;
+    DocumentPositionData[] documentPositionData;
+    DocumentStructure documentStructure;
+
+}
@@ -0,0 +1,198 @@
+package com.iqser.red.service.redaction.v1.server.document.data.mapper;
+
+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.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Footer;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Header;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Paragraph;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Section;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
+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 com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Headline;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class DocumentGraphMapper {
+
+    public Document toDocumentGraph(DocumentData documentData) {
+
+        Document document = new Document();
+        DocumentTree documentTree = new DocumentTree(document);
+        Context context = new Context(documentData, documentTree);
+
+        context.pageData.addAll(Arrays.stream(documentData.getDocumentPages()).map(DocumentGraphMapper::buildPage).toList());
+
+        context.documentTree.getRoot().getChildren().addAll(buildEntries(documentData.getDocumentStructure().getRoot().getChildren(), context));
+
+        document.setDocumentTree(context.documentTree);
+        document.setPages(new HashSet<>(context.pageData));
+        document.setNumberOfPages(documentData.getDocumentPages().length);
+
+        document.setTextBlock(document.getTextBlock());
+        return document;
+    }
+
+
+    private List<DocumentTree.Entry> buildEntries(List<DocumentStructure.EntryData> entries, Context context) {
+
+        List<DocumentTree.Entry> newEntries = new LinkedList<>();
+        for (DocumentStructure.EntryData entryData : entries) {
+
+            List<Page> pages = Arrays.stream(entryData.getPageNumbers()).map(pageNumber -> getPage(pageNumber, context)).toList();
+
+            SemanticNode node = switch (entryData.getType()) {
+                case SECTION -> buildSection(context);
+                case PARAGRAPH -> buildParagraph(context);
+                case HEADLINE -> buildHeadline(context);
+                case HEADER -> buildHeader(context);
+                case FOOTER -> buildFooter(context);
+                case TABLE -> buildTable(context, entryData.getProperties());
+                case TABLE_CELL -> buildTableCell(context, entryData.getProperties());
+                case IMAGE -> buildImage(context, entryData.getProperties(), entryData.getPageNumbers());
+                default -> throw new UnsupportedOperationException("Not yet implemented for type " + entryData.getType());
+            };
+
+            if (entryData.getAtomicBlockIds().length > 0) {
+                TextBlock textBlock = toTextBlock(entryData.getAtomicBlockIds(), context, node);
+                node.setLeafTextBlock(textBlock);
+            }
+            List<Integer> treeId = Arrays.stream(entryData.getTreeId()).boxed().toList();
+            node.setTreeId(treeId);
+
+            switch (entryData.getType()) {
+                case HEADER -> pages.forEach(page -> page.setHeader((Header) node));
+                case FOOTER -> pages.forEach(page -> page.setFooter((Footer) node));
+                default -> pages.forEach(page -> page.getMainBody().add(node));
+            }
+
+            newEntries.add(DocumentTree.Entry.builder().treeId(treeId).children(buildEntries(entryData.getChildren(), context)).node(node).build());
+        }
+        return newEntries;
+    }
+
+
+    private Headline buildHeadline(Context context) {
+
+        return Headline.builder().documentTree(context.documentTree).build();
+    }
+
+
+    private Image buildImage(Context context, Map<String, String> properties, Long[] pageNumbers) {
+
+        assert pageNumbers.length == 1;
+        Page page = getPage(pageNumbers[0], context);
+        var builder = Image.builder();
+        PropertiesMapper.parseImageProperties(properties, builder);
+        return builder.documentTree(context.documentTree).page(page).build();
+    }
+
+
+    private TableCell buildTableCell(Context context, Map<String, String> properties) {
+
+        TableCell.TableCellBuilder builder = TableCell.builder();
+        PropertiesMapper.parseTableCellProperties(properties, builder);
+        return builder.documentTree(context.documentTree).build();
+    }
+
+
+    private Table buildTable(Context context, Map<String, String> properties) {
+
+        Table.TableBuilder builder = Table.builder();
+        PropertiesMapper.parseTableProperties(properties, builder);
+        return builder.documentTree(context.documentTree).build();
+    }
+
+
+    private Footer buildFooter(Context context) {
+
+        return Footer.builder().documentTree(context.documentTree).build();
+    }
+
+
+    private Header buildHeader(Context context) {
+
+        return Header.builder().documentTree(context.documentTree).build();
+    }
+
+
+    private Section buildSection(Context context) {
+
+        return Section.builder().documentTree(context.documentTree).build();
+    }
+
+
+    private Paragraph buildParagraph(Context context) {
+
+        return Paragraph.builder().documentTree(context.documentTree).build();
+    }
+
+
+    private TextBlock toTextBlock(Long[] atomicTextBlockIds, Context context, SemanticNode parent) {
+
+        return Arrays.stream(atomicTextBlockIds).map(atomicTextBlockId -> getAtomicTextBlock(context, parent, atomicTextBlockId)).collect(new TextBlockCollector());
+    }
+
+
+    private AtomicTextBlock getAtomicTextBlock(Context context, SemanticNode parent, Long atomicTextBlockId) {
+
+        return AtomicTextBlock.fromAtomicTextBlockData(context.documentTextData.get(Math.toIntExact(atomicTextBlockId)),
+                context.documentPositionData.get(Math.toIntExact(atomicTextBlockId)),
+                parent,
+                getPage(context.documentTextData.get(Math.toIntExact(atomicTextBlockId)).getPage(), context));
+    }
+
+
+    private Page buildPage(DocumentPage p) {
+
+        return Page.builder().rotation(p.getRotation()).height(p.getHeight()).width(p.getWidth()).number(p.getNumber()).mainBody(new LinkedList<>()).build();
+    }
+
+
+    private Page getPage(Long pageIndex, Context context) {
+
+        return context.pageData.stream()
+                .filter(page -> page.getNumber() == Math.toIntExact(pageIndex))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException(String.format("ClassificationPage with number %d not found", pageIndex)));
+    }
+
+
+    static final class Context {
+
+        private final DocumentTree documentTree;
+        private final List<Page> pageData;
+        private final List<DocumentTextData> documentTextData;
+        private final List<DocumentPositionData> documentPositionData;
+
+
+        Context(DocumentData documentData, DocumentTree documentTree) {
+
+            this.documentTree = documentTree;
+            this.pageData = new LinkedList<>();
+            this.documentTextData = Arrays.stream(documentData.getDocumentTextData()).toList();
+            this.documentPositionData = Arrays.stream(documentData.getDocumentPositionData()).toList();
+
+        }
+
+    }
+
+}
@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.document.data.mapper;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class PropertiesMapper {
+
+    public void parseImageProperties(Map<String, String> properties, Image.ImageBuilder builder) {
+
+        builder.imageType(ImageType.fromString(properties.get(DocumentStructure.ImageProperties.IMAGE_TYPE)));
+        builder.transparent(Boolean.parseBoolean(properties.get(DocumentStructure.ImageProperties.TRANSPARENT)));
+        builder.position(parseRectangle2D(properties.get(DocumentStructure.ImageProperties.POSITION)));
+        builder.id(properties.get(DocumentStructure.ImageProperties.ID));
+    }
+
+
+    public void parseTableCellProperties(Map<String, String> properties, TableCell.TableCellBuilder builder) {
+
+        builder.row(Integer.parseInt(properties.get(DocumentStructure.TableCellProperties.ROW)));
+        builder.col(Integer.parseInt(properties.get(DocumentStructure.TableCellProperties.COL)));
+        builder.header(Boolean.parseBoolean(properties.get(DocumentStructure.TableCellProperties.HEADER)));
+        builder.bBox(parseRectangle2D(properties.get(DocumentStructure.TableCellProperties.B_BOX)));
+    }
+
+
+    public void parseTableProperties(Map<String, String> properties, Table.TableBuilder builder) {
+
+        builder.numberOfRows(Integer.parseInt(properties.get(DocumentStructure.TableProperties.NUMBER_OF_ROWS)));
+        builder.numberOfCols(Integer.parseInt(properties.get(DocumentStructure.TableProperties.NUMBER_OF_COLS)));
+    }
+
+
+    private Rectangle2D parseRectangle2D(String bBox) {
+
+        List<Float> floats = Arrays.stream(bBox.split(DocumentStructure.RECTANGLE_DELIMITER)).map(Float::parseFloat).toList();
+        return new Rectangle2D.Float(floats.get(0), floats.get(1), floats.get(2), floats.get(3));
+    }
+
+}
@@ -0,0 +1,166 @@
+package com.iqser.red.service.redaction.v1.server.document.graph;
+
+import static java.lang.String.format;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+
+@Setter
+@EqualsAndHashCode
+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 boundary.start() < this.end && this.start < boundary.end();
+    }
+
+
+    public List<Boundary> split(List<Integer> splitIndices) {
+
+        if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
+            throw new IndexOutOfBoundsException(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(Collection<Boundary> boundaries) {
+
+        int minStart = boundaries.stream().mapToInt(Boundary::start).min().orElseThrow(IllegalArgumentException::new);
+        int maxEnd = boundaries.stream().mapToInt(Boundary::end).max().orElseThrow(IllegalArgumentException::new);
+        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;
+    }
+
+
+    /**
+     * shrinks the boundary, such that textBlock.subSequence(boundary) returns a string without trailing or preceding whitespaces.
+     *
+     * @param textBlock TextBlock to check whitespaces against
+     * @return trimmed boundary
+     */
+    public Boundary trim(TextBlock textBlock) {
+
+        if (this.length() == 0) {
+            return this;
+        }
+        int trimmedStart = this.start;
+        while (textBlock.containsIndex(trimmedStart) && trimmedStart < end && Character.isWhitespace(textBlock.charAt(trimmedStart))) {
+            trimmedStart++;
+        }
+
+        int trimmedEnd = this.end;
+        while (textBlock.containsIndex(trimmedEnd - 1) && trimmedStart < trimmedEnd && Character.isWhitespace(textBlock.charAt(trimmedEnd - 1))) {
+            trimmedEnd--;
+        }
+
+        return new Boundary(trimmedStart, Math.max(trimmedEnd, trimmedStart));
+    }
+
+}
@@ -0,0 +1,70 @@
+package com.iqser.red.service.redaction.v1.server.document.graph;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+import com.google.common.base.Functions;
+
+public class ConsecutiveBoundaryCollector implements Collector<Boundary, List<Boundary>, List<Boundary>> {
+
+    @Override
+    public Supplier<List<Boundary>> supplier() {
+
+        return LinkedList::new;
+    }
+
+
+    @Override
+    public BiConsumer<List<Boundary>, Boundary> accumulator() {
+
+        return (existingList, boundary) -> {
+            if (existingList.isEmpty()) {
+                existingList.add(boundary);
+                return;
+            }
+
+            Boundary prevBoundary = existingList.get(existingList.size() - 1);
+            if (prevBoundary.end() > boundary.start()) {
+                throw new IllegalArgumentException(String.format("Can't concatenate %s and %s. Boundaries must be ordered!", prevBoundary, boundary));
+            }
+
+            if (prevBoundary.end() == boundary.start()) {
+                existingList.remove(existingList.size() - 1);
+                existingList.add(Boundary.merge(List.of(prevBoundary, boundary)));
+            } else {
+                existingList.add(boundary);
+            }
+        };
+    }
+
+
+    @Override
+    public BinaryOperator<List<Boundary>> combiner() {
+
+        return (list1, list2) -> {
+            list1.addAll(list2);
+            return list1;
+        };
+    }
+
+
+    @Override
+    public Function<List<Boundary>, List<Boundary>> finisher() {
+
+        return Functions.identity();
+    }
+
+
+    @Override
+    public Set<Characteristics> characteristics() {
+
+        return Set.of(Characteristics.IDENTITY_FINISH);
+    }
+
+}
@@ -0,0 +1,217 @@
+package com.iqser.red.service.redaction.v1.server.document.graph;
+
+import static java.lang.String.format;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.GenericSemanticNode;
+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.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
+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.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@EqualsAndHashCode
+public class DocumentTree {
+
+    private final Entry root;
+
+
+    public DocumentTree(Document document) {
+
+        root = Entry.builder().treeId(Collections.emptyList()).children(new LinkedList<>()).node(document).build();
+    }
+
+
+    public TextBlock buildTextBlock() {
+
+        return allEntriesInOrder().map(Entry::getNode).filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+    }
+
+
+    public List<Integer> createNewMainEntryAndReturnId(GenericSemanticNode node) {
+
+        return createNewChildEntryAndReturnIdImpl(Collections.emptyList(), node);
+    }
+
+
+    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, GenericSemanticNode node) {
+
+        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
+    }
+
+
+    public List<Integer> createNewChildEntryAndReturnId(GenericSemanticNode parentNode, Table node) {
+
+        return createNewChildEntryAndReturnIdImpl(parentNode.getTreeId(), node);
+    }
+
+
+    public List<Integer> createNewTableChildEntryAndReturnId(Table parentTable, TableCell tableCell) {
+
+        return createNewChildEntryAndReturnIdImpl(parentTable.getTreeId(), tableCell);
+    }
+
+
+    @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD actually flags this wrong
+    private List<Integer> createNewChildEntryAndReturnIdImpl(List<Integer> parentId, SemanticNode node) {
+
+        if (!entryExists(parentId)) {
+            throw new IllegalArgumentException(format("parentId %s does not exist!", parentId));
+        }
+
+        Entry parent = getEntryById(parentId);
+        List<Integer> newId = new LinkedList<>(parentId);
+        newId.add(parent.children.size());
+        parent.children.add(Entry.builder().treeId(newId).node(node).build());
+
+        return newId;
+    }
+
+
+    private boolean entryExists(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root != null;
+        }
+        Entry entry = root.children.get(treeId.get(0));
+        for (int id : treeId.subList(1, treeId.size())) {
+            if (id >= entry.children.size() || 0 > id) {
+                return false;
+            }
+            entry = entry.children.get(id);
+        }
+        return true;
+    }
+
+
+    public Entry getParentEntryById(List<Integer> treeId) {
+
+        return getEntryById(getParentId(treeId));
+    }
+
+
+    public boolean hasParentById(List<Integer> treeId) {
+
+        return !treeId.isEmpty();
+    }
+
+
+    public Stream<SemanticNode> childNodes(List<Integer> treeId) {
+
+        return getEntryById(treeId).children.stream().map(Entry::getNode);
+    }
+
+
+    public Stream<SemanticNode> childNodesOfType(List<Integer> treeId, NodeType nodeType) {
+
+        return getEntryById(treeId).children.stream().filter(entry -> entry.node.getType().equals(nodeType)).map(Entry::getNode);
+    }
+
+
+    private static List<Integer> getParentId(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            throw new UnsupportedOperationException("Root has no parent!");
+        }
+        if (treeId.size() < 2) {
+            return Collections.emptyList();
+        }
+        return treeId.subList(0, treeId.size() - 1);
+    }
+
+
+    public Entry getEntryById(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root;
+        }
+        Entry entry = root.children.get(treeId.get(0));
+        for (int id : treeId.subList(1, treeId.size())) {
+            entry = entry.children.get(id);
+        }
+        return entry;
+    }
+
+
+    public Stream<Entry> mainEntries() {
+
+        return root.children.stream();
+    }
+
+
+    public Stream<Entry> allEntriesInOrder() {
+
+        return Stream.of(root).flatMap(DocumentTree::flatten);
+    }
+
+
+    public Stream<Entry> allSubEntriesInOrder(List<Integer> parentId) {
+
+        return getEntryById(parentId).children.stream().flatMap(DocumentTree::flatten);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.join("\n", allEntriesInOrder().map(Entry::toString).toList());
+    }
+
+
+    private static Stream<Entry> flatten(Entry entry) {
+
+        return Stream.concat(Stream.of(entry), entry.children.stream().flatMap(DocumentTree::flatten));
+    }
+
+
+    public SemanticNode getHighestParentById(List<Integer> treeId) {
+
+        if (treeId.isEmpty()) {
+            return root.node;
+        }
+        return root.children.get(treeId.get(0)).node;
+    }
+
+
+    @Builder
+    @Getter
+    @AllArgsConstructor
+    @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+    public static class Entry {
+
+        List<Integer> treeId;
+        SemanticNode node;
+        @Builder.Default
+        List<Entry> children = new LinkedList<>();
+
+
+        @Override
+        public String toString() {
+
+            return node.toString();
+        }
+
+
+        public NodeType getType() {
+
+            return node.getType();
+        }
+
+    }
+
+}
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;

 public enum EntityType {
    ENTITY,
@@ -0,0 +1,70 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@EqualsAndHashCode
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public final class MatchedRule implements Comparable<MatchedRule> {
+
+    @Builder.Default
+    RuleIdentifier ruleIdentifier = RuleIdentifier.empty();
+    @Builder.Default
+    String reason = "";
+    @Builder.Default
+    String legalBasis = "";
+    boolean applied;
+    boolean writeValueWithLineBreaks;
+    @Builder.Default
+    Set<RedactionEntity> references = Collections.emptySet();
+
+
+    public static MatchedRule empty() {
+
+        return MatchedRule.builder().build();
+    }
+
+
+    @Override
+    public int compareTo(MatchedRule matchedRule) {
+
+        RuleIdentifier otherRuleIdentifier = matchedRule.getRuleIdentifier();
+        if (!Objects.equals(ruleIdentifier.type(), otherRuleIdentifier.type())) {
+            if (Objects.equals(otherRuleIdentifier.type(), "MAN")) {
+                return 1;
+            }
+            if (Objects.equals(ruleIdentifier.type(), "MAN")) {
+                return -1;
+            }
+            if (Objects.equals(otherRuleIdentifier.type(), "X")) {
+                return 1;
+            }
+            if (Objects.equals(ruleIdentifier.type(), "X")) {
+                return -1;
+            }
+        }
+        if (!Objects.equals(otherRuleIdentifier.unit(), getRuleIdentifier().unit())) {
+            return otherRuleIdentifier.unit() - ruleIdentifier.unit();
+        }
+        return otherRuleIdentifier.id() - ruleIdentifier.id();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "MatchedRule[" + "ruleIdentifier=" + ruleIdentifier + ", " + "reason=" + reason + ", " + "legalBasis=" + legalBasis + ", " + "applied=" + applied + ", " + "writeValueWithLineBreaks=" + writeValueWithLineBreaks + ", " + "references=" + references + ']';
+    }
+
+}
@@ -0,0 +1,159 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.PriorityQueue;
+import java.util.Set;
+
+import lombok.NonNull;
+
+public interface MatchedRuleHolder {
+
+    PriorityQueue<MatchedRule> getMatchedRuleList();
+
+
+    boolean isIgnored();
+
+
+    boolean isRemoved();
+
+
+    void setIgnored(boolean ignored);
+
+
+    void setRemoved(boolean ignored);
+
+
+    default boolean isApplied() {
+
+        return getMatchedRule().isApplied();
+    }
+
+
+    default Set<RedactionEntity> getReferences() {
+
+        return getMatchedRule().getReferences();
+    }
+
+
+    default boolean isActive() {
+
+        return !(isRemoved() || isIgnored());
+    }
+
+
+    default void apply(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
+
+        if (legalBasis.isBlank() || legalBasis.isEmpty()) {
+            throw new IllegalArgumentException("legal basis cannot be empty when redacting an entity");
+        }
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).legalBasis(legalBasis).applied(true).build());
+    }
+
+
+    default void force(@NonNull String ruleIdentifier, String reason, String legalBasis) {
+
+        addMatchedRule(MatchedRule.builder()
+                .ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier))
+                .reason(reason)
+                .legalBasis(getLegalBasisOrPreviousLegalBasisOrPlaceHolder(legalBasis))
+                .applied(true)
+                .build());
+    }
+
+
+    default void skip(@NonNull String ruleIdentifier, String reason) {
+
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
+    }
+
+
+    default void remove(String ruleIdentifier, String reason) {
+
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
+        setRemoved(true);
+    }
+
+
+    default void ignore(String ruleIdentifier, String reason) {
+
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).build());
+        setIgnored(true);
+    }
+
+
+    private String getLegalBasisOrPreviousLegalBasisOrPlaceHolder(String legalBasis) {
+
+        if (legalBasis == null || legalBasis.isBlank() || legalBasis.isEmpty()) {
+            if (getMatchedRule() == null || !getMatchedRule().isApplied()) {
+                return "n-a";
+            }
+            return getMatchedRule().getLegalBasis();
+        }
+        return legalBasis;
+    }
+
+
+    default void applyWithLineBreaks(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis) {
+
+        if (legalBasis.isBlank() || legalBasis.isEmpty()) {
+            throw new IllegalArgumentException("legal basis cannot be empty when redacting an entity");
+        }
+        getMatchedRuleList().add(MatchedRule.builder()
+                .ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier))
+                .reason(reason)
+                .legalBasis(legalBasis)
+                .applied(true)
+                .writeValueWithLineBreaks(true)
+                .build());
+    }
+
+
+    default void applyWithReferences(@NonNull String ruleIdentifier, String reason, @NonNull String legalBasis, Collection<RedactionEntity> references) {
+
+        if (legalBasis.isBlank() || legalBasis.isEmpty()) {
+            throw new IllegalArgumentException("legal basis cannot be empty when redacting an entity");
+        }
+        getMatchedRuleList().add(MatchedRule.builder()
+                .ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier))
+                .reason(reason)
+                .legalBasis(legalBasis)
+                .applied(true)
+                .references(new HashSet<>(references))
+                .build());
+    }
+
+
+    default void skipWithReferences(@NonNull String ruleIdentifier, String reason, Collection<RedactionEntity> references) {
+
+        getMatchedRuleList().add(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).references(new HashSet<>(references)).build());
+    }
+
+
+    default void addMatchedRule(MatchedRule matchedRule) {
+
+        getMatchedRuleList().add(matchedRule);
+    }
+
+
+    default void addMatchedRules(Collection<MatchedRule> matchedRules) {
+
+        getMatchedRuleList().addAll(matchedRules);
+    }
+
+
+    default int getMatchedRuleUnit() {
+
+        return getMatchedRule().getRuleIdentifier().unit();
+    }
+
+
+    default MatchedRule getMatchedRule() {
+
+        if (getMatchedRuleList().isEmpty()) {
+            return MatchedRule.empty();
+        }
+        return getMatchedRuleList().peek();
+    }
+
+}
@@ -0,0 +1,205 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.awt.geom.Rectangle2D;
+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.PriorityQueue;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Engine;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+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.EqualsAndHashCode;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+public class RedactionEntity implements MatchedRuleHolder {
+
+    // initial values
+    @EqualsAndHashCode.Include
+    final Boundary boundary;
+    @EqualsAndHashCode.Include
+    final String type;
+    @EqualsAndHashCode.Include
+    final EntityType entityType;
+
+    // empty defaults
+    boolean removed;
+    boolean ignored;
+
+    boolean resized;
+    boolean skipRemoveEntitiesContainedInLarger;
+    boolean dictionaryEntry;
+    boolean dossierDictionaryEntry;
+    @Builder.Default
+    Set<Engine> engines = new HashSet<>();
+
+    @Builder.Default
+    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+
+    // inferred on graph insertion
+    String value;
+    String textBefore;
+    String textAfter;
+    @Builder.Default
+    Set<Page> pages = new HashSet<>();
+    List<RedactionPosition> redactionPositionsPerPage;
+    @Builder.Default
+    List<SemanticNode> intersectingNodes = new LinkedList<>();
+    SemanticNode deepestFullyContainingNode;
+
+
+    public static RedactionEntity initialEntityNode(Boundary boundary, String type, EntityType entityType) {
+
+        return RedactionEntity.builder().type(type).entityType(entityType).boundary(boundary).build();
+    }
+
+
+    public boolean occursInNodeOfType(Class<? extends SemanticNode> clazz) {
+
+        return intersectingNodes.stream().anyMatch(clazz::isInstance);
+    }
+
+
+    public boolean occursInNode(SemanticNode semanticNode) {
+
+        return intersectingNodes.stream().anyMatch(node -> node.equals(semanticNode));
+    }
+
+
+    public boolean isType(String type) {
+
+        return this.type.equals(type);
+    }
+
+
+    public boolean isAnyType(List<String> types) {
+
+        return types.contains(type);
+    }
+
+
+    public void addIntersectingNode(SemanticNode containingNode) {
+
+        intersectingNodes.add(containingNode);
+    }
+
+
+    public String getValueWithLineBreaks() {
+
+        return getDeepestFullyContainingNode().getTextBlock().subSequenceWithLineBreaks(getBoundary());
+    }
+
+
+    public void removeFromGraph() {
+
+        intersectingNodes.forEach(node -> node.getEntities().remove(this));
+        pages.forEach(page -> page.getEntities().remove(this));
+        intersectingNodes = new LinkedList<>();
+        deepestFullyContainingNode = null;
+        pages = new HashSet<>();
+        removed = true;
+    }
+
+
+    public List<RedactionPosition> getRedactionPositionsPerPage() {
+
+        if (redactionPositionsPerPage == null || redactionPositionsPerPage.isEmpty()) {
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(boundary);
+
+            Page firstPage = rectanglesPerLinePerPage.keySet()
+                    .stream()
+                    .min(Comparator.comparingInt(Page::getNumber))
+                    .orElseThrow(() -> new RuntimeException("No Positions found on any page!"));
+
+            String id = IdBuilder.buildId(pages, rectanglesPerLinePerPage.values().stream().flatMap(Collection::stream).toList(), type, entityType.name());
+            redactionPositionsPerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildRedactionPosition(firstPage, id, entry)).toList();
+        }
+        return redactionPositionsPerPage;
+    }
+
+
+    private static RedactionPosition buildRedactionPosition(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
+
+        if (entry.getKey().equals(firstPage)) {
+            return new RedactionPosition(id, entry.getKey(), entry.getValue());
+        } else {
+            return new RedactionPosition(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
+        }
+    }
+
+
+    public boolean containedBy(RedactionEntity redactionEntity) {
+
+        return this.boundary.containedBy(redactionEntity.getBoundary());
+    }
+
+
+    public boolean contains(RedactionEntity redactionEntity) {
+
+        return this.boundary.contains(redactionEntity.getBoundary());
+    }
+
+
+    public boolean intersects(RedactionEntity redactionEntity) {
+
+        return this.boundary.intersects(redactionEntity.getBoundary());
+    }
+
+
+    public void addEngine(Engine engine) {
+
+        engines.add(engine);
+    }
+
+
+    public void addEngines(Set<Engine> engines) {
+
+        this.engines.addAll(engines);
+    }
+
+
+    public 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();
+    }
+
+}
@@ -0,0 +1,24 @@
+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.Page;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class RedactionPosition {
+
+    final String id;
+    Page page;
+    // Each entry in this list corresponds to an entry in the redaction log, this means:
+    // An entity might be represented by multiple redaction log entries
+    List<Rectangle2D> rectanglePerLine;
+
+}
@@ -0,0 +1,41 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.entity;
+
+import java.util.Objects;
+
+public record RuleIdentifier(String type, Integer unit, Integer id) {
+
+    public static RuleIdentifier fromString(String identifier) {
+
+        String[] values = identifier.split("\\.");
+        if (values.length != 3) {
+            throw new IllegalArgumentException("Illegal rule identifier provided: " + identifier);
+        }
+        String type = values[0];
+        Integer group = Integer.parseInt(values[1]);
+        Integer id = Integer.parseInt(values[2]);
+        return new RuleIdentifier(type, group, id);
+    }
+
+
+    public static RuleIdentifier empty() {
+
+        return new RuleIdentifier("", null, null);
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append(type());
+        if (Objects.nonNull(unit()) && Objects.nonNull(id())) {
+            sb.append(".").append(unit()).append(".").append(id());
+        } else if (Objects.nonNull(id())) {
+            sb.append(".*.").append(id());
+        } else if (Objects.nonNull(unit())) {
+            sb.append(".").append(unit()).append(".*");
+        }
+        return sb.toString();
+    }
+
+}
@@ -0,0 +1,127 @@
+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 java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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 Document implements GenericSemanticNode {
+
+    Set<Page> pages;
+    DocumentTree documentTree;
+    Integer numberOfPages;
+    TextBlock textBlock;
+    @Builder.Default
+    Set<RedactionEntity> entities = new HashSet<>();
+    @Builder.Default
+    static final SectionIdentifier sectionIdentifier = SectionIdentifier.document();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.DOCUMENT;
+    }
+
+
+    public TextBlock getTextBlock() {
+
+        if (textBlock == null) {
+            textBlock = streamTerminalTextBlocksInOrder().collect(new TextBlockCollector());
+        }
+        return textBlock;
+    }
+
+
+    public List<Section> getMainSections() {
+
+        return streamChildrenOfType(NodeType.SECTION).map(node -> (Section) node).collect(Collectors.toList());
+    }
+
+
+    public Stream<TextBlock> streamTerminalTextBlocksInOrder() {
+
+        return streamAllNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock);
+    }
+
+
+    @Override
+    public List<Integer> getTreeId() {
+
+        return Collections.emptyList();
+    }
+
+
+    @Override
+    public void setTreeId(List<Integer> tocId) {
+
+        throw new UnsupportedOperationException("Document is always the root of the TablePageBlock of Contents");
+    }
+
+
+    @Override
+    public SectionIdentifier getSectionIdentifier() {
+
+        return sectionIdentifier;
+    }
+
+
+    @Override
+    public Headline getHeadline() {
+
+        return streamAllSubNodesOfType(NodeType.HEADLINE).map(node -> (Headline) node).findFirst().orElseGet(Headline::empty);
+    }
+
+
+    private Stream<SemanticNode> streamAllNodes() {
+
+        return documentTree.allEntriesInOrder().map(DocumentTree.Entry::getNode);
+    }
+
+
+    public Stream<Image> streamAllImages() {
+
+        return streamAllSubNodesOfType(NodeType.IMAGE).map(node -> (Image) node);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return NodeType.DOCUMENT + ": " + this.getTextBlock().buildSummary();
+    }
+
+
+    @Override
+    public Map<Page, Rectangle2D> getBBox() {
+
+        Map<Page, Rectangle2D> bBox = new HashMap<>();
+        for (Page page : pages) {
+            bBox.put(page, new Rectangle2D.Double(0, 0, page.getWidth(), page.getHeight()));
+        }
+        return bBox;
+    }
+
+}
@@ -0,0 +1,74 @@
+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.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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 Footer implements GenericSemanticNode {
+
+    @Builder.Default
+    final static SectionIdentifier sectionIdentifier = SectionIdentifier.empty();
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.FOOTER;
+    }
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public SectionIdentifier getSectionIdentifier() {
+
+        return sectionIdentifier;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.FOOTER + ": " + leafTextBlock.buildSummary();
+    }
+
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+public interface GenericSemanticNode extends SemanticNode {
+
+}
@@ -0,0 +1,74 @@
+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.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+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 Header implements GenericSemanticNode {
+
+    @Builder.Default
+    final static SectionIdentifier sectionIdentifier = SectionIdentifier.empty();
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.HEADER;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public SectionIdentifier getSectionIdentifier() {
+
+        return sectionIdentifier;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.HEADER + ": " + leafTextBlock.buildSummary();
+    }
+
+}
@@ -0,0 +1,95 @@
+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.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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.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 Headline implements GenericSemanticNode {
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+    SectionIdentifier sectionIdentifier;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.HEADLINE;
+    }
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.HEADLINE + ": " + leafTextBlock.buildSummary();
+    }
+
+
+    @Override
+    public Headline getHeadline() {
+
+        return this;
+    }
+
+
+    @Override
+    public SectionIdentifier getSectionIdentifier() {
+
+        if (sectionIdentifier == null) {
+            sectionIdentifier = SectionIdentifier.fromSearchText(getTextBlock().getSearchText());
+        }
+        return sectionIdentifier;
+    }
+
+
+    public static Headline empty() {
+
+        return Headline.builder().leafTextBlock(AtomicTextBlock.empty(-1L, 0, new Page(), -1, null)).build();
+    }
+
+
+    public boolean hasParagraphs() {
+
+        return getParent().streamAllSubNodesOfType(NodeType.PARAGRAPH).findFirst().isPresent();
+    }
+
+}
@@ -0,0 +1,94 @@
+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.PriorityQueue;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.MatchedRuleHolder;
+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.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Image implements GenericSemanticNode, MatchedRuleHolder {
+
+    List<Integer> treeId;
+    String id;
+
+    ImageType imageType;
+    boolean transparent;
+    Rectangle2D position;
+
+    boolean removed;
+    boolean ignored;
+
+    @Builder.Default
+    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+
+    @EqualsAndHashCode.Exclude
+    Page page;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.IMAGE;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+    }
+
+
+    @Override
+    public Set<Page> getPages() {
+
+        return Collections.singleton(page);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.IMAGE + ": " + imageType.toString() + " " + position;
+    }
+
+
+    @Override
+    public Map<Page, Rectangle2D> getBBox() {
+
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
+        bBoxPerPage.put(page, position);
+        return bBoxPerPage;
+    }
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.Locale;
+
+public enum ImageType {
+    LOGO,
+    FORMULA,
+    SIGNATURE,
+    OTHER,
+    OCR;
+
+
+    public static ImageType fromString(String imageType) {
+
+        return switch (imageType.toLowerCase(Locale.ROOT)) {
+            case "logo" -> ImageType.LOGO;
+            case "formula" -> ImageType.FORMULA;
+            case "signature" -> ImageType.SIGNATURE;
+            case "ocr" -> ImageType.OCR;
+            default -> ImageType.OTHER;
+        };
+    }
+}
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.Locale;
+
+public enum NodeType {
+    DOCUMENT,
+    SECTION,
+    HEADLINE,
+    PARAGRAPH,
+    TABLE,
+    TABLE_CELL,
+    IMAGE,
+    HEADER,
+    FOOTER;
+
+
+    public String toString() {
+
+        return this.name().charAt(0) + this.name().substring(1).toLowerCase(Locale.ROOT);
+    }
+}
@@ -0,0 +1,76 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Page {
+
+    Integer number;
+    Integer height;
+    Integer width;
+    Integer rotation;
+
+    @EqualsAndHashCode.Exclude
+    List<SemanticNode> mainBody;
+    @EqualsAndHashCode.Exclude
+    Header header;
+    @EqualsAndHashCode.Exclude
+    Footer footer;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<Image> images = new HashSet<>();
+
+
+    public TextBlock getMainBodyTextBlock() {
+
+        return mainBody.stream().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).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 Page && o.hashCode() == this.hashCode();
+    }
+
+}
@@ -0,0 +1,62 @@
+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.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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 Paragraph implements GenericSemanticNode {
+
+    List<Integer> treeId;
+    TextBlock leafTextBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.PARAGRAPH;
+    }
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return true;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        return leafTextBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.PARAGRAPH + ": " + leafTextBlock.buildSummary();
+    }
+
+}
@@ -0,0 +1,95 @@
+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.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+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;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class Section implements GenericSemanticNode {
+
+    List<Integer> treeId;
+
+    TextBlock textBlock;
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.SECTION;
+    }
+
+
+    public boolean hasTables() {
+
+        return streamAllSubNodesOfType(NodeType.TABLE).findAny().isPresent();
+    }
+
+
+    @Override
+    public SectionIdentifier getSectionIdentifier() {
+
+        return getHeadline().getSectionIdentifier();
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        if (textBlock == null) {
+            textBlock = streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+        }
+        return textBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId.toString() + ": " + NodeType.SECTION + ": " + this.getTextBlock().buildSummary();
+    }
+
+
+    public Headline getHeadline() {
+
+        return streamChildrenOfType(NodeType.HEADLINE)//
+                .map(node -> (Headline) node)//
+                .findFirst()//
+                .orElseGet(() -> getParent().getHeadline());
+    }
+
+
+    public boolean anyHeadlineContainsString(String value) {
+
+        return streamAllSubNodesOfType(NodeType.HEADLINE).anyMatch(h -> h.containsString(value));
+    }
+
+
+    public boolean anyHeadlineContainsStringIgnoreCase(String value) {
+
+        return streamAllSubNodesOfType(NodeType.HEADLINE).anyMatch(h -> h.containsStringIgnoreCase(value));
+    }
+
+}
@@ -0,0 +1,123 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class SectionIdentifier {
+
+    static Pattern numericalIdentifierPattern = Pattern.compile("^[\\s]?(\\d+)[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?[\\s.,;]?(\\d+)?");
+
+    private enum Format {
+        EMPTY,
+        NUMERICAL,
+        DOCUMENT
+    }
+
+    Format format;
+    String identifierString;
+    List<Integer> identifiers;
+    boolean asChild;
+
+
+    public static SectionIdentifier fromSearchText(String headline) {
+
+        if (headline == null || headline.isEmpty() || headline.isBlank()) {
+            return SectionIdentifier.empty();
+        }
+
+        Matcher numericalIdentifierMatcher = numericalIdentifierPattern.matcher(headline);
+        if (numericalIdentifierMatcher.find()) {
+            return buildNumericalSectionIdentifier(headline, numericalIdentifierMatcher);
+        }
+        // more formats here
+        return SectionIdentifier.empty();
+    }
+
+
+    public static SectionIdentifier asChildOf(SectionIdentifier sectionIdentifier) {
+
+        return new SectionIdentifier(sectionIdentifier.format, sectionIdentifier.toString(), sectionIdentifier.identifiers, true);
+    }
+
+
+    public static SectionIdentifier document() {
+
+        return new SectionIdentifier(Format.DOCUMENT, "document", Collections.emptyList(), false);
+    }
+
+
+    public static SectionIdentifier empty() {
+
+        return new SectionIdentifier(Format.EMPTY, "empty", Collections.emptyList(), false);
+    }
+
+
+    private static SectionIdentifier buildNumericalSectionIdentifier(String headline, Matcher numericalIdentifierMatcher) {
+
+        String identifierString = headline.substring(numericalIdentifierMatcher.start(), numericalIdentifierMatcher.end());
+        List<Integer> identifiers = new LinkedList<>();
+        for (int i = 1; i <= 4; i++) {
+            String numericalIdentifier = numericalIdentifierMatcher.group(i);
+            if (numericalIdentifier == null || numericalIdentifier.equals("0") || numericalIdentifier.isEmpty() || numericalIdentifier.isBlank()) {
+                break;
+            }
+            identifiers.add(Integer.parseInt(numericalIdentifier.trim()));
+        }
+        return new SectionIdentifier(Format.NUMERICAL, identifierString, identifiers.stream().toList(), false);
+    }
+
+
+    /**
+     * Determines if the current section is the parent of the given section.
+     *
+     * @param sectionIdentifier The section identifier to compare against.
+     * @return true if the current section is the parent of the given section, false otherwise.
+     */
+    public boolean isParentOf(SectionIdentifier sectionIdentifier) {
+
+        if (this.format.equals(Format.EMPTY)) {
+            return false;
+        }
+        if (this.format.equals(Format.DOCUMENT)) {
+            return true;
+        }
+        if (!this.format.equals(sectionIdentifier.format)) {
+            return false;
+        }
+        if (this.identifiers.size() >= sectionIdentifier.identifiers.size() && !(this.identifiers.size() == sectionIdentifier.identifiers.size() && sectionIdentifier.asChild)) {
+            return false;
+        }
+        for (int i = 0; i < this.identifiers.size(); i++) {
+            if (!this.identifiers.get(i).equals(sectionIdentifier.identifiers.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    public boolean isChildOf(SectionIdentifier sectionIdentifier) {
+
+        if (this.format.equals(Format.DOCUMENT) || this.format.equals(Format.EMPTY)) {
+            return false;
+        }
+        return sectionIdentifier.isParentOf(this);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return identifierString;
+    }
+
+}
@@ -0,0 +1,574 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import static java.lang.String.format;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+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.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.document.utils.RedactionSearchUtility;
+
+public interface SemanticNode {
+
+    /**
+     * Returns the type of this node, such as Section, Paragraph, etc.
+     *
+     * @return NodeType of this node
+     */
+    NodeType getType();
+
+
+    /**
+     * Searches all Nodes located underneath this Node in the DocumentTree and concatenates their AtomicTextBlocks into a single TextBlock.
+     * So, for a Section all TextBlocks of Subsections, Paragraphs, and Tables are concatenated into a single TextBlock
+     * If the Node is a Leaf, the LeafTextBlock will be returned instead.
+     *
+     * @return TextBlock containing all AtomicTextBlocks that are located under this Node.
+     */
+    TextBlock getTextBlock();
+
+
+    /**
+     * 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<RedactionEntity> 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 TextBlock.
+     *
+     * @return Set of PageNodes this node appears on.
+     */
+    default Set<Page> getPages() {
+
+        return getTextBlock().getPages();
+    }
+
+    /**
+     * Finds the first page associated with this Node.
+     *
+     * @return Set of PageNodes this node appears on.
+     */
+    default Page getFirstPage() {
+
+        return getTextBlock().getPages().stream().min(Comparator.comparingInt(Page::getNumber)).orElseThrow();
+    }
+
+
+    /**
+     * Each AtomicTextBlock is assigned a page, so to get the pages for this boundary, it collects the PageNodes from each AtomicTextBlock belonging to this node's TextBlock.
+     *
+     * @return Set of PageNodes this node appears on.
+     */
+    default Set<Page> getPages(Boundary boundary) {
+
+        if (!getBoundary().contains(boundary)) {
+            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", boundary, getBoundary()));
+        }
+        return getTextBlock().getPages(boundary);
+    }
+
+
+    default boolean isOnPage(int pageNumber) {
+
+        return getPages().stream().anyMatch(page -> page.getNumber() == pageNumber);
+    }
+
+
+    /**
+     * Returns the DocumentTree Object.
+     *
+     * @return the DocumentTree of the Document this node belongs to
+     */
+    DocumentTree getDocumentTree();
+
+
+    /**
+     * The id is a List of Integers uniquely identifying this node in the DocumentTree.
+     *
+     * @return the DocumentTree ID
+     */
+    List<Integer> getTreeId();
+
+
+    /**
+     * This should only be used during graph construction.
+     *
+     * @param tocId List of Integers
+     */
+    void setTreeId(List<Integer> tocId);
+
+
+    /**
+     * Traverses the Tree up, until it hits a Headline or hits a Section which will then return the first Headline from its children.
+     * If no Headline is found this way, it will recursively traverse the tree up and try again until it hits the root, where it will perform a BFS.
+     * If no Headline exists anywhere in the Document a dummy Headline is returned.
+     *
+     * @return First Headline found.
+     */
+    default Headline getHeadline() {
+
+        return getParent().getHeadline();
+    }
+
+
+    /**
+     * Returns a SectionIdentifier, such that it acts as a child of the first Headline associated with this SemanticNode.
+     *
+     * @return The SectionIdentifier from the first Headline.
+     */
+    default SectionIdentifier getSectionIdentifier() {
+
+        return SectionIdentifier.asChildOf(getHeadline().getSectionIdentifier());
+    }
+
+
+    /**
+     * Checks if its TreeId has a length greater than zero.
+     *
+     * @return boolean indicating whether this Node has a Parent in the DocumentTree
+     */
+    default boolean hasParent() {
+
+        return getDocumentTree().hasParentById(getTreeId());
+    }
+
+
+    /**
+     * @return The SemanticNode representing the Parent in the DocumentTree
+     * throws NotFoundException, when no parent is present
+     */
+    default SemanticNode getParent() {
+
+        return getDocumentTree().getParentEntryById(getTreeId()).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 getDocumentTree().getHighestParentById(getTreeId());
+    }
+
+
+    /**
+     * Leaf means a SemanticNode has direct access to a TextBlock, by default this is false and must be overridden.
+     * Currently only Sections, Images, and Tables are not leaves.
+     * A TableCell might be a leaf depending on its area compared to the page.
+     *
+     * @return boolean, indicating if a Node has direct access to a TextBlock
+     */
+    default boolean isLeaf() {
+
+        return false;
+    }
+
+
+    /**
+     * Leaf means a SemanticNode has direct access to a TextBlock, by default this is false and must be overridden.
+     * Currently only Sections and Tables are no leaves.
+     *
+     * @return AtomicTextBlock
+     */
+    default TextBlock getLeafTextBlock() {
+
+        throw new UnsupportedOperationException("Only leaf Nodes have access to LeafTextBlocks!");
+    }
+
+
+    /**
+     * Should only be used during construction of the Graph. Sets the LeafTextBlock of this SemanticNode.
+     *
+     * @param textBlock the TextBlock to set as the LeafTextBlock of this SemanticNode
+     */
+    default void setLeafTextBlock(TextBlock textBlock) {
+
+        throw new UnsupportedOperationException();
+    }
+
+
+    /**
+     * Checks whether this SemanticNode has any Entity of the provided type.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param type string representing the type of entity to check for
+     * @return true, if this SemanticNode has at least one Entity of the provided type
+     */
+    default boolean hasEntitiesOfType(String type) {
+
+        return getEntities().stream().filter(RedactionEntity::isActive).anyMatch(redactionEntity -> redactionEntity.getType().equals(type));
+    }
+
+
+    /**
+     * Checks whether this SemanticNode has any Entity of the provided types.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param types an array of strings representing the types of entities to check for
+     * @return true, if this SemanticNode has at least one Entity of any of the provided types
+     */
+    default boolean hasEntitiesOfAnyType(String... types) {
+
+        return getEntities().stream().filter(RedactionEntity::isActive).anyMatch(redactionEntity -> Arrays.stream(types).anyMatch(type -> redactionEntity.getType().equals(type)));
+    }
+
+
+    /**
+     * Checks whether this SemanticNode has at least one Entity of each of the provided types.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param types an array of strings representing the types of entities to check for
+     * @return true, if this SemanticNode has at least one Entity of each of the provided types
+     */
+    default boolean hasEntitiesOfAllTypes(String... types) {
+
+        return getEntities().stream()
+                .filter(RedactionEntity::isActive)
+                .map(RedactionEntity::getType)
+                .collect(Collectors.toUnmodifiableSet())
+                .containsAll(Arrays.stream(types).toList());
+    }
+
+
+    /**
+     * Returns a List of Entities in this SemanticNode which are of the provided type such as "CBI_author".
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param type string representing the type of entities to return
+     * @return List of RedactionEntities of any the type
+     */
+    default List<RedactionEntity> getEntitiesOfType(String type) {
+
+        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.getType().equals(type)).toList();
+    }
+
+
+    /**
+     * Returns a List of Entities in this SemanticNode which have any of the provided types such as "CBI_author".
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param types A list of strings representing the types of entities to return
+     * @return List of RedactionEntities of any provided type
+     */
+    default List<RedactionEntity> getEntitiesOfType(List<String> types) {
+
+        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.isAnyType(types)).toList();
+    }
+
+
+    /**
+     * Returns a List of Entities in this SemanticNode which have any of the provided types.
+     * Ignores Entity with the ignored flag set to true or the removed flag set to true.
+     *
+     * @param types A list of strings representing the types of entities to return
+     * @return List of RedactionEntities that match any of the provided types
+     */
+    default List<RedactionEntity> getEntitiesOfType(String... types) {
+
+        return getEntities().stream().filter(RedactionEntity::isActive).filter(redactionEntity -> redactionEntity.isAnyType(Arrays.stream(types).toList())).toList();
+    }
+
+
+    /**
+     * 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 = getTextBlock();
+        if (!textBlock.getAtomicTextBlocks().isEmpty()) {
+            return getTextBlock().getAtomicTextBlocks().get(0).getNumberOnPage();
+        } else {
+            return -1;
+        }
+    }
+
+
+    /**
+     * Checks if the SemanticNode contains any text.
+     *
+     * @return true, if this node's TextBlock is not empty
+     */
+    default boolean hasText() {
+
+        return !getTextBlock().isEmpty();
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains the provided String.
+     *
+     * @param string A String which the TextBlock might contain
+     * @return true, if this node's TextBlock contains the string
+     */
+    default boolean containsString(String string) {
+
+        return getTextBlock().getSearchText().contains(string);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains all the provided Strings.
+     *
+     * @param strings A List of Strings which the TextBlock might contain
+     * @return true, if this node's TextBlock contains all strings
+     */
+    default boolean containsAllStrings(String... strings) {
+
+        return Arrays.stream(strings).allMatch(this::containsString);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains any of the provided Strings.
+     *
+     * @param strings A List of Strings to check if they are contained in the TextBlock
+     * @return true, if this node's TextBlock contains any of the provided strings
+     */
+    default boolean containsAnyString(String... strings) {
+
+        return Arrays.stream(strings).anyMatch(this::containsString);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains any of the provided Strings.
+     *
+     * @param strings A List of Strings which the TextBlock might contain
+     * @return true, if this node's TextBlock contains any of the strings
+     */
+    default boolean containsAnyString(List<String> strings) {
+
+        return strings.stream().anyMatch(this::containsString);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains all the provided Strings ignoring case.
+     *
+     * @param string A String which the TextBlock might contain
+     * @return true, if this node's TextBlock contains the string ignoring case
+     */
+    default boolean containsStringIgnoreCase(String string) {
+
+        return getTextBlock().getSearchText().toLowerCase(Locale.ROOT).contains(string.toLowerCase(Locale.ROOT));
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains any of the provided Strings ignoring case.
+     *
+     * @param strings A List of Strings which the TextBlock might contain
+     * @return true, if this node's TextBlock contains any of the strings
+     */
+    default boolean containsAnyStringIgnoreCase(String... strings) {
+
+        return Arrays.stream(strings).anyMatch(this::containsStringIgnoreCase);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode contains any of the provided Strings ignoring case.
+     *
+     * @param strings A List of Strings which the TextBlock might contain
+     * @return true, if this node's TextBlock contains any of the strings
+     */
+    default boolean containsAllStringsIgnoreCase(String... strings) {
+
+        return Arrays.stream(strings).allMatch(this::containsStringIgnoreCase);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode matches the provided regex pattern.
+     *
+     * @param regexPattern A String representing a regex pattern, which the TextBlock might contain
+     * @return true, if this node's TextBlock contains the regex pattern
+     */
+    default boolean matchesRegex(String regexPattern) {
+
+        return RedactionSearchUtility.anyMatch(getTextBlock(), regexPattern);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode matches the provided regex pattern ignoring case.
+     *
+     * @param regexPattern A String representing a regex pattern, which the TextBlock might contain
+     * @return true, if this node's TextBlock contains the regex pattern ignoring case
+     */
+    default boolean matchesRegexIgnoreCase(String regexPattern) {
+
+        return RedactionSearchUtility.anyMatchIgnoreCase(getTextBlock(), regexPattern);
+    }
+
+
+    /**
+     * This function is used during insertion of EntityNodes into the graph, it checks if the boundary of the RedactionEntity intersects or even contains the RedactionEntity.
+     * It sets the fields accordingly and recursively calls this function on all its children.
+     *
+     * @param redactionEntity RedactionEntity, which is being inserted into the graph
+     */
+    default void addThisToEntityIfIntersects(RedactionEntity redactionEntity) {
+
+        TextBlock textBlock = getTextBlock();
+        if (textBlock.getBoundary().intersects(redactionEntity.getBoundary())) {
+            if (textBlock.containsBoundary(redactionEntity.getBoundary())) {
+                redactionEntity.setDeepestFullyContainingNode(this);
+            }
+
+            redactionEntity.addIntersectingNode(this);
+            streamChildren().filter(semanticNode -> semanticNode.getBoundary().intersects(redactionEntity.getBoundary()))
+                    .forEach(node -> node.addThisToEntityIfIntersects(redactionEntity));
+        }
+    }
+
+
+    /**
+     * Streams all children located directly underneath this node in the DocumentTree.
+     *
+     * @return Stream of all children
+     */
+    default Stream<SemanticNode> streamChildren() {
+
+        return getDocumentTree().childNodes(getTreeId());
+    }
+
+
+    /**
+     * Streams all children located directly underneath this node in the DocumentTree of the provided type.
+     *
+     * @return Stream of all children
+     */
+    default Stream<SemanticNode> streamChildrenOfType(NodeType nodeType) {
+
+        return getDocumentTree().childNodesOfType(getTreeId(), nodeType);
+    }
+
+
+    /**
+     * Recursively streams all SemanticNodes located underneath this node in the DocumentTree in order.
+     *
+     * @return Stream of all SubNodes
+     */
+    default Stream<SemanticNode> streamAllSubNodes() {
+
+        return getDocumentTree().allSubEntriesInOrder(getTreeId()).map(DocumentTree.Entry::getNode);
+    }
+
+
+    /**
+     * Recursively streams all SemanticNodes of the provided type located underneath this node in the DocumentTree in order.
+     *
+     * @return Stream of all SubNodes
+     */
+    default Stream<SemanticNode> streamAllSubNodesOfType(NodeType nodeType) {
+
+        return getDocumentTree().allSubEntriesInOrder(getTreeId()).filter(entry -> entry.getType().equals(nodeType)).map(DocumentTree.Entry::getNode);
+    }
+
+
+    /**
+     * The Boundary is the start and end string offsets in the reading order of the document.
+     *
+     * @return Boundary of this Node's TextBlock
+     */
+    default Boundary getBoundary() {
+
+        return getTextBlock().getBoundary();
+    }
+
+
+    /**
+     * Returns the length of the text content in this Node's TextBlock.
+     *
+     * @return The length of the text content
+     */
+    default int length() {
+
+        return getBoundary().length();
+    }
+
+
+    /**
+     * If this Node is a Leaf it will calculate the boundingBox of its LeafTextBlock, otherwise it will calculate the Union of the BoundingBoxes of all its Children.
+     * If called on the Document, it will return the cropbox of each page
+     *
+     * @return Rectangle2D fully encapsulating this Node for each page.
+     */
+    default Map<Page, Rectangle2D> getBBox() {
+
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
+        if (isLeaf()) {
+            return getBBoxFromLeafTextBlock(bBoxPerPage);
+        }
+
+        return getBBoxFromChildren(bBoxPerPage);
+    }
+
+
+    /**
+     * Checks whether the Bounding Box of this SemanticNode contains the provided rectangle on the provided page.
+     *
+     * @param rectangle2D The rectangle to check if it is contained
+     * @param pageNumber  The Page number on which the rectangle should be checked
+     * @return boolean
+     */
+    default boolean containsRectangle(Rectangle2D rectangle2D, Integer pageNumber) {
+
+        Page helperPage = Page.builder().number(pageNumber).build();
+        if (!getPages().contains(helperPage)) {
+            return false;
+        }
+        return getBBox().get(helperPage).contains(rectangle2D);
+    }
+
+
+    /**
+     * TODO: this produces unwanted results for sections spanning multiple columns.
+     *
+     * @param bBoxPerPage initial empty BoundingBox
+     * @return The union of the BoundingBoxes of all children
+     */
+    private Map<Page, Rectangle2D> getBBoxFromChildren(Map<Page, 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 TextBlock of this node
+     */
+    private Map<Page, Rectangle2D> getBBoxFromLeafTextBlock(Map<Page, Rectangle2D> bBoxPerPage) {
+
+        Map<Page, List<AtomicTextBlock>> atomicTextBlockPerPage = getTextBlock().getAtomicTextBlocks().stream().collect(Collectors.groupingBy(AtomicTextBlock::getPage));
+        atomicTextBlockPerPage.forEach((page, atbs) -> bBoxPerPage.put(page, RectangleTransformations.atomicTextBlockBBox(atbs)));
+        return bBoxPerPage;
+    }
+
+}
@@ -0,0 +1,320 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
+
+import static java.lang.String.format;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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 Table implements SemanticNode {
+
+    List<Integer> treeId;
+    DocumentTree documentTree;
+
+    int numberOfRows;
+    int numberOfCols;
+
+    TextBlock textBlock;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    /**
+     * Streams all entities in this table, that appear in a row, which contains any of the provided strings.
+     *
+     * @param strings Strings to check whether a row contains them
+     * @return Stream of all entities in this table, that appear in a row, which contains any of the provided strings
+     */
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsStringsIgnoreCase(List<String> strings) {
+
+        return IntStream.range(0, numberOfRows)
+                .boxed()
+                .filter(row -> rowContainsStringsIgnoreCase(row, strings))
+                .flatMap(this::streamRow)
+                .map(TableCell::getEntities)
+                .flatMap(Collection::stream);
+    }
+
+
+    /**
+     * Checks whether the specified row contains all the provided strings.
+     *
+     * @param row     the row to check as an Integer, must be smaller than numberOfRows
+     * @param strings a list of strings to check for
+     * @return true, if all strings appear in the provided row
+     */
+    public boolean rowContainsStringsIgnoreCase(Integer row, List<String> strings) {
+
+        String rowText = streamRow(row).map(TableCell::getTextBlock).collect(new TextBlockCollector()).getSearchText().toLowerCase(Locale.ROOT);
+        return strings.stream().map(String::toLowerCase).allMatch(rowText::contains);
+    }
+
+
+    /**
+     * Streams all entities which appear in a row where at least one cell has the provided header and the provided value.
+     *
+     * @param header the header value to search for
+     * @param value  the string which the table cell should contain
+     * @return a stream of all entities, which appear in a row where at least one cell has the provided header and the provided value.
+     */
+    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndValue(String header, String value) {
+
+        List<Integer> vertebrateStudyCols = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
+        return streamTableCells().filter(tableCellNode -> vertebrateStudyCols.stream()
+                .anyMatch(vertebrateStudyCol -> getCell(tableCellNode.getRow(), vertebrateStudyCol).containsString(value))).map(TableCell::getEntities).flatMap(Collection::stream);
+    }
+
+
+    /**
+     * Streams all entities which appear in a row where at least one cell has the provided header and any provided value.
+     *
+     * @param header the header value to search for
+     * @param values the strings which the table cell should contain
+     * @return a stream of all entities, which appear in a row where at least one cell has the provided header and any provided value.
+     */
+    public Stream<RedactionEntity> streamEntitiesWhereRowHasHeaderAndAnyValue(String header, List<String> values) {
+
+        List<Integer> colsWithHeader = streamHeaders().filter(headerNode -> headerNode.containsString(header)).map(TableCell::getCol).toList();
+        return streamTableCells().filter(tableCellNode -> colsWithHeader.stream()
+                .anyMatch(colWithHeader -> getCell(tableCellNode.getRow(), colWithHeader).containsAnyString(values))).map(TableCell::getEntities).flatMap(Collection::stream);
+    }
+
+
+    /**
+     * Streams all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param types type strings to check whether a row contains an entity like them
+     * @return Stream of all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
+     */
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
+
+        List<Integer> rowsWithEntityOfType = getEntities().stream()
+                .filter(RedactionEntity::isActive)
+                .filter(redactionEntity -> types.stream().anyMatch(type -> type.equals(redactionEntity.getType())))
+                .map(RedactionEntity::getIntersectingNodes)
+                .filter(node -> node instanceof TableCell)
+                .map(node -> (TableCell) node)
+                .map(TableCell::getRow)
+                .toList();
+
+        return rowsWithEntityOfType.stream().flatMap(this::streamRow).map(TableCell::getEntities).flatMap(Collection::stream);
+    }
+
+
+    /**
+     * Streams all entities in this table, that appear in a row, which contains no entity of any of the provided types.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param types type strings to check whether a row contains an entity like them
+     * @return Stream of all entities in this table, that appear in a row, which contains at least one entity with any of the provided types.
+     */
+    public Stream<RedactionEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
+
+        return IntStream.range(0, numberOfRows)
+                .boxed()
+                .filter(rowNumber -> streamRow(rowNumber).map(TableCell::getEntities)
+                        .flatMap(Collection::stream)
+                        .filter(RedactionEntity::isActive)
+                        .noneMatch(entity -> types.contains(entity.getType())))
+                .flatMap(this::streamRow)
+                .map(TableCell::getEntities)
+                .flatMap(Collection::stream);
+    }
+
+
+    /**
+     * Returns a TableCell at the provided row and column location.
+     *
+     * @param row int representing the row, must be smaller than numberOfRows
+     * @param col int representing the col, must be smaller than numberOfCols
+     * @return TableCell at the provided location in the table
+     */
+    public TableCell getCell(int row, int col) {
+
+        if (numberOfRows - row < 0 || numberOfCols - col < 0) {
+            throw new IllegalArgumentException(format("row %d, col %d is out of bounds for number of rows of %d and number of cols %d", row, col, numberOfRows, numberOfCols));
+        }
+        int idx = row * numberOfCols + col;
+        return (TableCell) documentTree.getEntryById(treeId).getChildren().get(idx).getNode();
+    }
+
+
+    /**
+     * Streams all TableCells in this Table row-wise.
+     *
+     * @return Stream of all TableCells
+     */
+    public Stream<TableCell> streamTableCells() {
+
+        return streamChildrenOfType(NodeType.TABLE_CELL).map(node -> (TableCell) node);
+    }
+
+
+    /**
+     * Streams all TableCells in this Table which have the provided header row-wise.
+     *
+     * @return Stream of all TableCells which have the provided header
+     */
+    public Stream<TableCell> streamTableCellsWithHeader(String header) {
+
+        return streamHeaders().filter(tableCellNode -> tableCellNode.getTextBlock().getSearchText().contains(header))
+                .map(TableCell::getCol)
+                .flatMap(this::streamCol)
+                .filter(tableCellNode -> !tableCellNode.isHeader());
+    }
+
+
+    /**
+     * Streams all TableCells belonging to the provided column from top down.
+     *
+     * @param col int representing the column
+     * @return Stream of all TableCell in the provided column
+     */
+    public Stream<TableCell> streamCol(int col) {
+
+        return IntStream.range(0, numberOfRows).boxed().map(row -> getCell(row, col));
+    }
+
+
+    /**
+     * Streams all TableCells belonging to the provided row from left to right.
+     *
+     * @param row int representing the row
+     * @return Stream of all TableCell in the provided row
+     */
+    public Stream<TableCell> streamRow(int row) {
+
+        return IntStream.range(0, numberOfCols).boxed().map(col -> getCell(row, col));
+    }
+
+
+    /**
+     * Streams all TableCells row-wise and filters them with header == true.
+     *
+     * @return Stream of all TableCells with header == true
+     */
+    public Stream<TableCell> streamHeaders() {
+
+        return streamTableCells().filter(TableCell::isHeader);
+    }
+
+
+    /**
+     * Streams all TableCells of the provided row and column and filters them with header == true.
+     *
+     * @param row int representing the row
+     * @param col int representing the column
+     * @return Stream of all TableCells with header == true in the provided row or col
+     */
+    public Stream<TableCell> streamHeadersForCell(int row, int col) {
+
+        return Stream.concat(streamRow(row), streamCol(col)).filter(TableCell::isHeader);
+    }
+
+
+    /**
+     * Streams all Headers and checks if any equal the provided string.
+     *
+     * @param header string to check the headers for
+     * @return true, if at least one header equals the provided string
+     */
+    public boolean hasHeader(String header) {
+
+        return streamHeaders().anyMatch(tableCellNode -> tableCellNode.getTextBlock().getSearchText().strip().equals(header));
+    }
+
+
+    /**
+     * Checks if this table has a column with the provided header and any of the table cells in that column contain the provided value.
+     *
+     * @param header string to find header cells
+     * @param value  string to check cells with provided header
+     * @return true, if this table has a column with the provided header and any of the table cells in that column contain the provided value
+     */
+    public boolean hasRowWithHeaderAndValue(String header, String value) {
+
+        return streamTableCellsWithHeader(header).anyMatch(tableCellNode -> tableCellNode.containsString(value));
+    }
+
+
+    /**
+     * Checks if this table has a column with the provided header and any of the table cells in that column contains any of the provided values.
+     *
+     * @param header string to find header cells
+     * @param values List of strings to check cells with provided header
+     * @return true, if this table has a column with the provided header and any of the table cells in that column contains any of the provided values.
+     */
+    public boolean hasRowWithHeaderAndAnyValue(String header, List<String> values) {
+
+        return streamTableCellsWithHeader(header).anyMatch(tableCellNode -> tableCellNode.containsAnyString(values));
+    }
+
+
+    /**
+     * Finds all entities of the provided type, which appear in the same row that the provided entity appears in.
+     * Ignores Entity with ignored == true or removed == true.
+     *
+     * @param type            the type of entities to search for
+     * @param redactionEntity the entity, which appears in the row to search
+     * @return List of all entities of the provided type, which appear in the same row that the provided entity appears in.
+     */
+    public List<RedactionEntity> getEntitiesOfTypeInSameRow(String type, RedactionEntity redactionEntity) {
+
+        return redactionEntity.getIntersectingNodes()
+                .stream()
+                .filter(node -> node instanceof TableCell)
+                .map(node -> (TableCell) node)
+                .flatMap(tableCellNode -> streamRow(tableCellNode.getRow()))
+                .map(cell -> cell.getEntitiesOfType(type))
+                .flatMap(Collection::stream)
+                .toList();
+    }
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.TABLE;
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        if (textBlock == null) {
+            textBlock = streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+        }
+        return textBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId.toString() + ": " + NodeType.TABLE + ": #cols: " + numberOfCols + ", #rows: " + numberOfRows + ", " + this.getTextBlock().buildSummary();
+    }
+
+}
@@ -0,0 +1,90 @@
+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 com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.DocumentTree;
+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 TableCell implements GenericSemanticNode {
+
+    List<Integer> treeId;
+    int row;
+    int col;
+    boolean header;
+
+    Rectangle2D bBox;
+
+    TextBlock leafTextBlock;
+
+    TextBlock textBlock;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<RedactionEntity> entities = new HashSet<>();
+
+
+    @Override
+    public Map<Page, Rectangle2D> getBBox() {
+
+        Map<Page, Rectangle2D> bBoxPerPage = new HashMap<>();
+        getPages().forEach(page -> bBoxPerPage.put(page, bBox));
+        return bBoxPerPage;
+    }
+
+
+    @Override
+    public NodeType getType() {
+
+        return NodeType.TABLE_CELL;
+    }
+
+
+    @Override
+    public boolean isLeaf() {
+
+        return getDocumentTree().getEntryById(getTreeId()).getChildren().isEmpty();
+    }
+
+
+    @Override
+    public TextBlock getTextBlock() {
+
+        if (isLeaf()) {
+            return leafTextBlock;
+        }
+
+        if (textBlock == null) {
+            textBlock = streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector());
+        }
+        return textBlock;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return treeId + ": " + NodeType.TABLE_CELL + ": " + this.getTextBlock().buildSummary();
+    }
+
+}
@@ -0,0 +1,230 @@
+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.Arrays;
+import java.util.Collection;
+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 com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
+import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class AtomicTextBlock implements TextBlock {
+
+    Long id;
+    Integer numberOnPage;
+    Page page;
+
+    //string coordinates
+    Boundary boundary;
+    String searchText;
+    List<Integer> lineBreaks;
+
+    //position coordinates
+    List<Integer> stringIdxToPositionIdx;
+    @Getter
+    List<Rectangle2D> positions;
+
+    @EqualsAndHashCode.Exclude
+    SemanticNode parent;
+
+
+    @Override
+    public int numberOfLines() {
+
+        return lineBreaks.size() + 1;
+    }
+
+    public static AtomicTextBlock empty(Long textBlockIdx, int stringOffset, Page page, int numberOnPage, SemanticNode parent) {
+
+        return AtomicTextBlock.builder()
+                .id(textBlockIdx)
+                .boundary(new Boundary(stringOffset, stringOffset))
+                .searchText("")
+                .lineBreaks(Collections.emptyList())
+                .page(page)
+                .numberOnPage(numberOnPage)
+                .stringIdxToPositionIdx(Collections.emptyList())
+                .positions(Collections.emptyList())
+                .parent(parent)
+                .build();
+    }
+
+
+    public static AtomicTextBlock fromAtomicTextBlockData(DocumentTextData atomicTextBlockData,
+                                                          DocumentPositionData atomicPositionBlockData,
+                                                          SemanticNode parent,
+                                                          Page page) {
+
+        return AtomicTextBlock.builder()
+                .id(atomicTextBlockData.getId())
+                .numberOnPage(atomicTextBlockData.getNumberOnPage())
+                .page(page)
+                .boundary(new Boundary(atomicTextBlockData.getStart(), atomicTextBlockData.getEnd()))
+                .searchText(atomicTextBlockData.getSearchText())
+                .lineBreaks(Arrays.stream(atomicTextBlockData.getLineBreaks()).boxed().toList())
+                .stringIdxToPositionIdx(Arrays.stream(atomicPositionBlockData.getStringIdxToPositionIdx()).boxed().toList())
+                .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();
+    }
+
+
+    public Boundary getLineBoundary(int lineNumber) {
+
+        if (lineNumber >= numberOfLines() || lineNumber < 0) {
+            return new Boundary(boundary.start(), boundary.start());
+        }
+        if (numberOfLines() == 1) {
+            return boundary;
+        }
+        if (lineNumber == 0) {
+            return new Boundary(boundary.start(), lineBreaks.get(0) + boundary.start());
+        } else if (lineNumber == numberOfLines() - 1) {
+            return new Boundary(lineBreaks.get(lineBreaks.size() - 1) + boundary.start(), boundary.end());
+        }
+        return new Boundary(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.length() == 0) {
+            return Collections.emptyList();
+        }
+
+        int startPositionIdx = stringIdxToPositionIdx.get(stringBoundary.start() - this.boundary.start());
+
+        if (stringBoundary.end() == this.boundary.end()) {
+            return positions.subList(startPositionIdx, positions.size());
+        }
+
+        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringBoundary.end() - this.boundary.start()));
+
+    }
+
+
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
+
+        List<Rectangle2D> rectanglesPerLine = stringBoundary.split(getAllLineBreaksInBoundary(stringBoundary))
+                .stream()
+                .map(this::getPositions)
+                .map(RectangleTransformations::rectangleBBoxWithGaps)
+                .flatMap(Collection::stream)
+                .toList();
+        Map<Page, List<Rectangle2D>> rectanglePerLinePerPage = new HashMap<>();
+        rectanglePerLinePerPage.put(page, rectanglesPerLine);
+        return rectanglePerLinePerPage;
+    }
+
+
+    @Override
+    public String subSequenceWithLineBreaks(Boundary boundary) {
+
+        if (boundary.length() == 0 || !getBoundary().contains(boundary)) {
+            return "";
+        }
+
+        Set<Integer> lbInBoundary = lineBreaks.stream().map(i -> i + boundary.start()).filter(boundary::contains).collect(Collectors.toSet());
+        if (boundary.end() == getBoundary().end()) {
+            lbInBoundary.add(getBoundary().end());
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = boundary.start(); i < boundary.end(); i++) {
+            char character = this.charAt(i);
+            if (lbInBoundary.contains(i + 1)) {
+                // always plus one, due to the linebreaks being an exclusive end index
+                if (!Character.isWhitespace(character)) {
+                    lbInBoundary.remove(i + 1);
+                    lbInBoundary.add(i + 2);
+                    sb.append(character);
+                    continue;
+                }
+                sb.append("\n");
+            } else {
+                sb.append(character);
+            }
+        }
+        return sb.toString();
+    }
+
+
+    private List<Integer> getAllLineBreaksInBoundary(Boundary boundary) {
+
+        return getLineBreaks().stream().map(linebreak -> linebreak + this.boundary.start()).filter(boundary::contains).toList();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return searchText;
+    }
+
+}
@@ -0,0 +1,236 @@
+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.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+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.nodes.Page;
+
+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 static ConcatenatedTextBlock empty() {
+
+        return new ConcatenatedTextBlock(Collections.emptyList());
+    }
+
+
+    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());
+        this.searchText = null;
+        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().mapToInt(AtomicTextBlock::numberOfLines).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);
+    }
+
+    public Boundary getLineBoundary(int lineNumber) {
+
+        if (atomicTextBlocks.size() == 1) {
+            return atomicTextBlocks.get(0).getLineBoundary(lineNumber);
+        }
+        int lineNumberInCurrentBlock = lineNumber;
+        for (AtomicTextBlock atomicTextBlock : atomicTextBlocks) {
+            if (lineNumberInCurrentBlock < atomicTextBlock.numberOfLines()) {
+                return atomicTextBlock.getLineBoundary(lineNumberInCurrentBlock);
+            }
+            lineNumberInCurrentBlock -= atomicTextBlock.numberOfLines();
+        }
+        return new Boundary(boundary.start(), boundary.start());
+    }
+
+    @Override
+    public List<Rectangle2D> getPositions(Boundary stringBoundary) {
+
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+
+        if (textBlocks.isEmpty()) {
+            return Collections.emptyList();
+        }
+        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<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary) {
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringBoundary);
+
+        if (textBlocks.isEmpty()) {
+            return new HashMap<>();
+        }
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).getPositionsPerPage(stringBoundary);
+        }
+
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new Boundary(stringBoundary.start(), firstTextBlock.getBoundary().end()));
+
+        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
+            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getBoundary()));
+        }
+
+        AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
+        rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage,
+                lastTextBlock.getPositionsPerPage(new Boundary(lastTextBlock.getBoundary().start(), stringBoundary.end())));
+
+        return rectanglesPerLinePerPage;
+    }
+
+
+    @Override
+    public String subSequenceWithLineBreaks(Boundary boundary) {
+
+        if (boundary.length() == 0 || !getBoundary().contains(boundary)) {
+            return "";
+        }
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(boundary);
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).subSequenceWithLineBreaks(boundary);
+        }
+
+        StringBuilder sb = new StringBuilder();
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        sb.append(firstTextBlock.subSequenceWithLineBreaks(new Boundary(boundary.start(), firstTextBlock.getBoundary().end())));
+
+        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
+            sb.append(textBlock.searchTextWithLineBreaks());
+        }
+
+        var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
+        sb.append(lastTextBlock.subSequenceWithLineBreaks(new Boundary(lastTextBlock.getBoundary().start(), boundary.end())));
+
+        return sb.toString();
+    }
+
+
+    private Map<Page, List<Rectangle2D>> mergeEntityPositionsWithSamePageNode(Map<Page, List<Rectangle2D>> map1, Map<Page, List<Rectangle2D>> map2) {
+
+        Map<Page, List<Rectangle2D>> mergedMap = new HashMap<>(map1);
+        map2.forEach((pageNode, rectangles) -> mergedMap.merge(pageNode, rectangles, (l1, l2) -> Stream.concat(l1.stream(), l2.stream()).toList()));
+        return mergedMap;
+    }
+
+
+    @Override
+    public String toString() {
+
+        return getSearchText();
+    }
+
+}
@@ -0,0 +1,167 @@
+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.Page;
+import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+
+public interface TextBlock extends CharSequence {
+
+    String getSearchText();
+
+
+    List<AtomicTextBlock> getAtomicTextBlocks();
+
+
+    Boundary getBoundary();
+
+
+    int getNextLinebreak(int fromIndex);
+
+
+    int getPreviousLinebreak(int fromIndex);
+
+
+    Boundary getLineBoundary(int lineNumber);
+
+
+
+    List<Integer> getLineBreaks();
+
+
+    Rectangle2D getPosition(int stringIdx);
+
+
+    List<Rectangle2D> getPositions(Boundary stringBoundary);
+
+
+    Map<Page, List<Rectangle2D>> getPositionsPerPage(Boundary stringBoundary);
+
+
+    String subSequenceWithLineBreaks(Boundary boundary);
+
+
+    int numberOfLines();
+
+
+    default CharSequence getLine(int lineNumber) {
+
+        return subSequence(getLineBoundary(lineNumber));
+    }
+
+
+    default List<Rectangle2D> getLinePositions(int lineNumber) {
+
+        return getPositions(getLineBoundary(lineNumber));
+    }
+
+
+    default Rectangle2D getLineBBox(int lineNumber) {
+
+        return RectangleTransformations.rectangle2DBBox(getLinePositions(lineNumber));
+    }
+
+    default String searchTextWithLineBreaks() {
+
+        return subSequenceWithLineBreaks(getBoundary());
+    }
+
+
+    default int indexOf(String searchTerm) {
+
+        return indexOf(searchTerm, getBoundary().start());
+    }
+
+
+    default Set<Page> getPages() {
+
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getPage).collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    default Set<Page> getPages(Boundary boundary) {
+
+        return getAtomicTextBlocks().stream()
+                .filter(atomicTextBlock -> atomicTextBlock.getBoundary().intersects(boundary))
+                .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,49 @@
+package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
+
+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 ConcatenatedTextBlock::empty;
+    }
+
+
+    @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,664 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import static com.iqser.red.service.redaction.v1.server.document.utils.RedactionSearchUtility.anyMatch;
+import static com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils.boundaryIsSurroundedBySeparators;
+import static java.util.stream.Collectors.toMap;
+
+import java.util.Collection;
+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 java.util.stream.Stream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.kie.api.runtime.KieSession;
+
+import com.google.common.base.Functions;
+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.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.document.utils.RedactionSearchUtility;
+import com.iqser.red.service.redaction.v1.server.document.graph.ConsecutiveBoundaryCollector;
+import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.adapter.NerEntitiesAdapter;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class EntityCreationService {
+
+    private final EntityEnrichmentService entityEnrichmentService;
+    private final KieSession kieSession;
+
+
+    public EntityCreationService(EntityEnrichmentService entityEnrichmentService) {
+
+        this.entityEnrichmentService = entityEnrichmentService;
+        this.kieSession = null;
+    }
+
+
+    public Stream<RedactionEntity> betweenStrings(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeStart(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+
+        startBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() - start.length());
+            boundary.setEnd(boundary.end() - start.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeStartIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+
+        startBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() - start.length());
+            boundary.setEnd(boundary.end() - start.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+
+        stopBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() + stop.length());
+            boundary.setEnd(boundary.end() + stop.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+
+        stopBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() + stop.length());
+            boundary.setEnd(boundary.end() + stop.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeStartAndEnd(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByString(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByString(stop, node.getTextBlock());
+
+        startBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() - start.length());
+            boundary.setEnd(boundary.end() - start.length());
+        });
+        stopBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() + stop.length());
+            boundary.setEnd(boundary.end() + stop.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+
+
+
+    public Stream<RedactionEntity> betweenStringsIncludeStartAndEndIgnoreCase(String start, String stop, String type, EntityType entityType, SemanticNode node) {
+
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(start, node.getTextBlock());
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByStringIgnoreCase(stop, node.getTextBlock());
+
+        startBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() - start.length());
+            boundary.setEnd(boundary.end() - start.length());
+        });
+        stopBoundaries.forEach(boundary -> {
+            boundary.setStart(boundary.start() + stop.length());
+            boundary.setEnd(boundary.end() + stop.length());
+        });
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+
+
+
+    public Stream<RedactionEntity> betweenRegexes(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStart, textBlock);
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByRegex(regexStop, textBlock);
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenRegexesIgnoreCase(String regexStart, String regexStop, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        List<Boundary> startBoundaries = RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexStart, 0, textBlock);
+        List<Boundary> stopBoundaries = RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexStop, 0, textBlock);
+
+        return betweenBoundaries(startBoundaries, stopBoundaries, type, entityType, node);
+    }
+
+
+    public Stream<RedactionEntity> betweenBoundaries(List<Boundary> startBoundaries, List<Boundary> stopBoundaries, String type, EntityType entityType, SemanticNode node) {
+
+        if (startBoundaries.isEmpty() || stopBoundaries.isEmpty()) {
+            return Stream.empty();
+        }
+        List<Boundary> entityBoundaries = findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(startBoundaries, stopBoundaries);
+        return entityBoundaries.stream()
+                .map(boundary -> boundary.trim(node.getTextBlock()))
+                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    private static List<Boundary> findNonOverlappingBoundariesBetweenBoundariesWithMinimalDistances(List<Boundary> startBoundaries, List<Boundary> stopBoundaries) {
+
+        List<Boundary> entityBoundaries = new LinkedList<>();
+        for (Boundary startBoundary : startBoundaries) {
+            Optional<Boundary> optionalStopBoundaryWithMinimalDistance = stopBoundaries.stream()
+                    .filter(stopBoundary -> stopBoundary.start() > startBoundary.end())
+                    .min(Comparator.comparingInt(Boundary::start));
+            if (optionalStopBoundaryWithMinimalDistance.isEmpty()) {
+                break;
+            }
+            entityBoundaries.add(new Boundary(startBoundary.end(), optionalStopBoundaryWithMinimalDistance.get().start()));
+        }
+        return removeOuterOverlappingBoundaries(entityBoundaries);
+    }
+
+
+    private static List<Boundary> removeOuterOverlappingBoundaries(List<Boundary> entityBoundaries) {
+        /*
+        In some cases we get boundaries, where one contains the other. This happens for Example when we have two start boundaries and one stop boundary after the two start boundaries.
+        Then we get two boundaries where one is entirely contained in the other. So we want to remove the outer boundary.
+        For Example consider the text: "a this is some text. a here is more text b". If "a" is the start string and "b" is the stop string, there are two possibilities.
+        "this is some text. a here is more text" and "here is more text". We only want to keep the latter.
+         */
+        return entityBoundaries.stream()
+                .filter(boundary -> entityBoundaries.stream().noneMatch(innerBoundary -> innerBoundary != boundary && innerBoundary.containedBy(boundary)))
+                .toList();
+
+    }
+
+
+    public Stream<RedactionEntity> bySearchImplementation(SearchImplementation searchImplementation, String type, EntityType entityType, SemanticNode node) {
+
+        return searchImplementation.getBoundaries(node.getTextBlock(), node.getBoundary())
+                .stream()
+                .filter(boundary -> isValidEntityBoundary(node.getTextBlock(), boundary))
+                .map(bounds -> byBoundary(bounds, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> lineAfterStrings(List<String> strings, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        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))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> lineAfterString(String string, String type, EntityType entityType, SemanticNode node) {
+
+        TextBlock textBlock = node.getTextBlock();
+        return RedactionSearchUtility.findBoundariesByString(string, textBlock)
+                .stream()
+                .map(boundary -> toLineAfterBoundary(textBlock, boundary))
+                .filter(boundary -> isValidEntityBoundary(textBlock, boundary))
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> lineAfterStringAcrossColumns(String string, String type, EntityType entityType, Table tableNode) {
+
+        return tableNode.streamTableCells()
+                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByString(string, tableCell.getTextBlock()),
+                        tableCell,
+                        type,
+                        entityType,
+                        tableNode));
+    }
+
+
+    public Stream<RedactionEntity> lineAfterStringAcrossColumnsIgnoreCase(String string, String type, EntityType entityType, Table tableNode) {
+
+        return tableNode.streamTableCells()
+                .flatMap(tableCell -> lineAfterBoundariesAcrossColumns(RedactionSearchUtility.findBoundariesByStringIgnoreCase(string, tableCell.getTextBlock()),
+                        tableCell,
+                        type,
+                        entityType,
+                        tableNode));
+    }
+
+
+    /**
+     * Looks across the remaining table row to the right of the provided TableCell if any line intersects the y coordinates of the found text.
+     *
+     * @param boundaries a list of boundaries
+     * @param tableCell  the table cell
+     * @param type       the type
+     * @param entityType the entity type
+     * @param tableNode  the table node
+     * @return a stream of RedactionEntities
+     */
+    private Stream<RedactionEntity> lineAfterBoundariesAcrossColumns(List<Boundary> boundaries, TableCell tableCell, String type, EntityType entityType, Table tableNode) {
+
+        return boundaries.stream()
+                .map(boundary -> RectangleTransformations.rectangle2DBBox(tableCell.getTextBlock().getPositions(boundary)))
+                .map(bBox -> Pair.of(bBox.getMaxY(), bBox.getMinY()))
+                .map(maxMinPair -> tableNode.streamRow(tableCell.getRow())
+                        .filter(nextTableCell -> nextTableCell.getCol() > tableCell.getCol())
+                        .map(nextTableCell -> RedactionSearchUtility.findBoundaryOfAllLinesInYRange(maxMinPair.getLeft(), maxMinPair.getRight(), nextTableCell.getTextBlock()))
+                        .map(b -> b.trim(tableNode.getTextBlock()))
+                        .filter(boundary -> isValidEntityBoundary(tableNode.getTextBlock(), boundary))
+                        .map(boundary -> byBoundary(boundary, type, entityType, tableNode))
+                        .filter(Optional::isPresent)
+                        .map(Optional::get))
+                .flatMap(Functions.identity());
+    }
+
+
+    public Optional<RedactionEntity> semanticNodeAfterString(SemanticNode semanticNode, String string, String type, EntityType entityType) {
+
+        var textBlock = semanticNode.getTextBlock();
+        int startIndex = Math.min(textBlock.indexOf(string), 0);
+        var boundary = new Boundary(startIndex, semanticNode.getBoundary().end());
+        if (boundary.length() > 0) {
+            boundary = new Boundary(boundary.start(), boundary.end() - 1);
+        }
+        if (!isValidEntityBoundary(textBlock, boundary)) {
+            return Optional.empty();
+        }
+        return byBoundary(boundary, type, entityType, semanticNode);
+    }
+
+
+    public Stream<RedactionEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexWithLineBreaks(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<RedactionEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexWithLineBreaksIgnoreCase(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<RedactionEntity> byRegex(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegex(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<RedactionEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, SemanticNode node) {
+
+        return byRegexIgnoreCase(regexPattern, type, entityType, 0, node);
+    }
+
+
+    public Stream<RedactionEntity> byRegexWithLineBreaks(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaks(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> byRegexWithLineBreaksIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findBoundariesByRegexWithLineBreaksIgnoreCase(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> byRegex(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findBoundariesByRegex(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> byRegexIgnoreCase(String regexPattern, String type, EntityType entityType, int group, SemanticNode node) {
+
+        return RedactionSearchUtility.findBoundariesByRegexIgnoreCase(regexPattern, group, node.getTextBlock())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> byString(String keyword, String type, EntityType entityType, SemanticNode node) {
+
+        return RedactionSearchUtility.findBoundariesByString(keyword, node.getTextBlock())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> bySemanticNodeParagraphsOnly(SemanticNode node, String type, EntityType entityType) {
+
+        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH).map(semanticNode -> bySemanticNode(semanticNode, type, entityType)).filter(Optional::isPresent).map(Optional::get);
+    }
+
+
+    public Stream<RedactionEntity> bySemanticNodeParagraphsOnlyMergeConsecutive(SemanticNode node, String type, EntityType entityType) {
+
+        return node.streamAllSubNodesOfType(NodeType.PARAGRAPH)
+                .map(SemanticNode::getBoundary)
+                .collect(new ConsecutiveBoundaryCollector())
+                .stream()
+                .map(boundary -> byBoundary(boundary, type, entityType, node))
+                .filter(Optional::isPresent)
+                .map(Optional::get);
+    }
+
+
+    public Optional<RedactionEntity> bySemanticNode(SemanticNode node, String type, EntityType entityType) {
+
+        Boundary boundary = node.getTextBlock().getBoundary();
+
+        if (boundary.length() > 0) {
+            boundary = new Boundary(boundary.start(), boundary.end() - 1);
+        }
+        if (!isValidEntityBoundary(node.getTextBlock(), boundary)) {
+            return Optional.empty();
+        }
+        return byBoundary(boundary, type, entityType, node);
+    }
+
+
+    public Optional<RedactionEntity> byPrefixExpansionRegex(RedactionEntity entity, String regexPattern) {
+
+        int expandedStart = RedactionSearchUtility.getExpandedStartByRegex(entity, regexPattern);
+        return byBoundary(new Boundary(expandedStart, entity.getBoundary().end()), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
+    }
+
+
+    public Optional<RedactionEntity> bySuffixExpansionRegex(RedactionEntity entity, String regexPattern) {
+
+        int expandedEnd = RedactionSearchUtility.getExpandedEndByRegex(entity, regexPattern);
+        expandedEnd = truncateEndIfLineBreakIsBetween(entity.getBoundary().end(), expandedEnd, entity.getDeepestFullyContainingNode().getTextBlock());
+        return byBoundary(new Boundary(entity.getBoundary().start(), expandedEnd), entity.getType(), entity.getEntityType(), entity.getDeepestFullyContainingNode());
+    }
+
+
+    private int truncateEndIfLineBreakIsBetween(int end, int expandedEnd, TextBlock textBlock) {
+
+        if (textBlock.getNextLinebreak(end) < expandedEnd) {
+            return end;
+        }
+        return expandedEnd;
+    }
+
+
+    /**
+     * Creates a redaction entity based on the given boundary, type, entity type, and semantic node.
+     * If the document already contains an equal redaction entity, then the original Entity is returned.
+     * Also inserts the Entity into the kieSession.
+     *
+     * @param boundary   The boundary of the redaction entity.
+     * @param type       The type of the redaction entity.
+     * @param entityType The entity type of the redaction entity.
+     * @param node       The semantic node to associate with the redaction entity.
+     * @return An Optional containing the redaction entity, or the previous entity if the entity already exists.
+     */
+    public Optional<RedactionEntity> byBoundary(Boundary boundary, String type, EntityType entityType, SemanticNode node) {
+
+        if (!node.getBoundary().contains(boundary)) {
+            throw new IllegalArgumentException(String.format("%s is not in the %s of the provided semantic node %s", boundary, node.getBoundary(), node));
+        }
+        Boundary trimmedBoundary = boundary.trim(node.getTextBlock());
+        RedactionEntity entity = RedactionEntity.initialEntityNode(trimmedBoundary, type, entityType);
+        if (node.getEntities().contains(entity)) {
+            return node.getEntities().stream().filter(entity::equals).peek(e -> e.addEngine(Engine.RULE)).findAny();
+        }
+        addEntityToGraph(entity, node);
+        entity.addEngine(Engine.RULE);
+        insertToKieSession(entity);
+        return Optional.of(entity);
+    }
+
+
+    public RedactionEntity forceByBoundary(Boundary boundary, String type, EntityType entityType, SemanticNode node) {
+
+        Boundary trimmedBoundary = boundary.trim(node.getTextBlock());
+        RedactionEntity entity = RedactionEntity.initialEntityNode(trimmedBoundary, type, entityType);
+        addEntityToGraph(entity, node);
+        return entity;
+    }
+
+
+    public RedactionEntity byEntities(List<RedactionEntity> entitiesToMerge, String type, EntityType entityType, SemanticNode node) {
+
+        if (!allEntitiesIntersectAndHaveSameTypes(entitiesToMerge)) {
+            throw new IllegalArgumentException("Provided entities can not be merged, since they do not intersect or are not the same type!" + entitiesToMerge);
+        }
+        if (entitiesToMerge.isEmpty()) {
+            throw new IllegalArgumentException("No Entities to merge!");
+        }
+        if (entitiesToMerge.size() == 1) {
+            return entitiesToMerge.get(0);
+        }
+
+        RedactionEntity mergedEntity = RedactionEntity.initialEntityNode(Boundary.merge(entitiesToMerge.stream().map(RedactionEntity::getBoundary).toList()), type, entityType);
+        mergedEntity.addEngines(entitiesToMerge.stream().flatMap(entityNode -> entityNode.getEngines().stream()).collect(Collectors.toSet()));
+        entitiesToMerge.stream().map(RedactionEntity::getMatchedRuleList).flatMap(Collection::stream).forEach(matchedRule -> mergedEntity.getMatchedRuleList().add(matchedRule));
+
+        mergedEntity.setDictionaryEntry(entitiesToMerge.stream().anyMatch(RedactionEntity::isDictionaryEntry));
+        mergedEntity.setDossierDictionaryEntry(entitiesToMerge.stream().anyMatch(RedactionEntity::isDossierDictionaryEntry));
+        mergedEntity.setIgnored(entitiesToMerge.stream().allMatch(RedactionEntity::isIgnored));
+        mergedEntity.setRemoved(entitiesToMerge.stream().allMatch(RedactionEntity::isRemoved));
+
+        addEntityToGraph(mergedEntity, node);
+        insertToKieSession(mergedEntity);
+        return mergedEntity;
+    }
+
+
+    private void insertToKieSession(RedactionEntity mergedEntity) {
+
+        if (kieSession != null) {
+            kieSession.insert(mergedEntity);
+        }
+    }
+
+
+    public RedactionEntity byNerEntity(NerEntities.NerEntity nerEntity, EntityType entityType, SemanticNode semanticNode) {
+
+        var entity = forceByBoundary(nerEntity.boundary(), nerEntity.type(), entityType, semanticNode);
+        entity.addEngine(Engine.NER);
+        insertToKieSession(entity);
+        return entity;
+    }
+
+
+    public RedactionEntity byNerEntity(NerEntities.NerEntity nerEntity, String type, EntityType entityType, SemanticNode semanticNode) {
+
+        var entity = forceByBoundary(nerEntity.boundary(), type, entityType, semanticNode);
+        entity.addEngine(Engine.NER);
+        insertToKieSession(entity);
+        return entity;
+    }
+
+
+    public Stream<RedactionEntity> combineNerEntitiesToCbiAddressDefaults(NerEntities nerEntities, String type, EntityType entityType, SemanticNode semanticNode) {
+
+        return NerEntitiesAdapter.combineNerEntitiesToCbiAddressDefaults(nerEntities)
+                .map(boundary -> forceByBoundary(boundary, type, entityType, semanticNode))
+                .peek(entity -> entity.addEngine(Engine.NER))
+                .peek(this::insertToKieSession);
+    }
+
+
+    public RedactionEntity byTableCellAsHighlight(TableCell tableCell, String type, EntityType entityType) {
+
+        RedactionEntity highlightEntity = RedactionEntity.initialEntityNode(new Boundary(tableCell.getBoundary().start(), tableCell.getBoundary().start()), type, entityType);
+
+        String positionId = IdBuilder.buildId(tableCell.getBBox().keySet(), tableCell.getBBox().values().stream().toList(), type, entityType.name());
+        highlightEntity.setRedactionPositionsPerPage(tableCell.getBBox()
+                .entrySet()
+                .stream()
+                .map(entry -> new RedactionPosition(positionId, entry.getKey(), List.of(entry.getValue())))
+                .toList());
+        addEntityToGraph(highlightEntity, tableCell);
+        return highlightEntity;
+    }
+
+
+    public boolean isValidEntityBoundary(TextBlock textBlock, Boundary boundary) {
+
+        return boundary.length() > 0 && boundaryIsSurroundedBySeparators(textBlock, boundary);
+    }
+
+
+    public void addEntityToGraph(RedactionEntity entity, SemanticNode node) {
+
+        DocumentTree documentTree = node.getDocumentTree();
+        try {
+            addEntityToGraph(entity, documentTree);
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
+            documentTree.getRoot().getNode().getEntities().add(entity);
+        } catch (NoSuchElementException e) {
+            entity.setDeepestFullyContainingNode(documentTree.getRoot().getNode());
+            entityEnrichmentService.enrichEntity(entity, entity.getDeepestFullyContainingNode().getTextBlock());
+            entity.addIntersectingNode(documentTree.getRoot().getNode());
+            addToPages(entity);
+            addEntityToNodeEntitySets(entity);
+        }
+    }
+
+
+    private void addEntityToGraph(RedactionEntity entity, DocumentTree documentTree) {
+
+        SemanticNode containingNode = documentTree.childNodes(Collections.emptyList())
+                .filter(node -> node.getTextBlock().containsBoundary(entity.getBoundary()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException("No containing Node found!"));
+
+        containingNode.addThisToEntityIfIntersects(entity);
+
+        TextBlock textBlock = entity.getDeepestFullyContainingNode().getTextBlock();
+        entityEnrichmentService.enrichEntity(entity, textBlock);
+
+        addToPages(entity);
+        addEntityToNodeEntitySets(entity);
+    }
+
+
+    private static void addToPages(RedactionEntity entity) {
+
+        Set<Page> pages = entity.getDeepestFullyContainingNode().getPages(entity.getBoundary());
+        entity.getPages().addAll(pages);
+        pages.forEach(page -> page.getEntities().add(entity));
+    }
+
+
+    private static void addEntityToNodeEntitySets(RedactionEntity entity) {
+
+        entity.getIntersectingNodes().forEach(node -> node.getEntities().add(entity));
+    }
+
+
+    private static boolean allEntitiesIntersectAndHaveSameTypes(List<RedactionEntity> entitiesToMerge) {
+
+        if (entitiesToMerge.isEmpty()) {
+            return true;
+        }
+        RedactionEntity previousEntity = entitiesToMerge.get(0);
+        for (RedactionEntity redactionEntity : entitiesToMerge.subList(1, entitiesToMerge.size())) {
+            boolean typeMatches = redactionEntity.getType().equals(previousEntity.getType());
+            boolean entityTypeMatches = redactionEntity.getEntityType().equals(previousEntity.getEntityType());
+            boolean intersects = redactionEntity.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())).trim(textBlock);
+    }
+
+}
@@ -0,0 +1,91 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+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(RedactionEntity 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 String 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.isEmpty()) {
+                return concatWordsAfter(wordsAfter.subList(0, numberOfWordsAfter), textAfter.startsWith(" "));
+            }
+        }
+        return "";
+    }
+
+
+    private String 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.isEmpty()) {
+                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;
+    }
+
+}
@@ -0,0 +1,64 @@
+package com.iqser.red.service.redaction.v1.server.document.services;
+
+import java.awt.geom.Rectangle2D;
+import java.util.NoSuchElementException;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionPosition;
+import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Image;
+import com.iqser.red.service.redaction.v1.server.document.utils.RectangleTransformations;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ManualRedactionApplicationService {
+
+    private final EntityCreationService entityCreationService;
+
+
+    public void resizeEntityAndReinsert(RedactionEntity entityToBeResized, ManualResizeRedaction manualResizeRedaction) {
+
+        RedactionPosition redactionPositionToBeResized = entityToBeResized.getRedactionPositionsPerPage()
+                .stream()
+                .filter(redactionPosition -> redactionPosition.getId().equals(manualResizeRedaction.getAnnotationId()))
+                .findFirst()
+                .orElseThrow(() -> new NoSuchElementException("No redaction position with matching annotation id found!"));
+
+        redactionPositionToBeResized.setRectanglePerLine(manualResizeRedaction.getPositions().stream().map(ManualRedactionApplicationService::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());
+        }
+
+        SemanticNode nodeToInsertInto = entityToBeResized.getDeepestFullyContainingNode().getDocumentTree().getRoot().getNode();
+        entityToBeResized.removeFromGraph();
+        entityToBeResized.setResized(true);
+        entityToBeResized.setRemoved(false);
+        entityToBeResized.setIgnored(false);
+        entityToBeResized.getBoundary().setStart(newStartOffset);
+        entityToBeResized.getBoundary().setEnd(newStartOffset + manualResizeRedaction.getValue().length());
+        entityCreationService.addEntityToGraph(entityToBeResized, nodeToInsertInto);
+    }
+
+
+    public void resizeImage(Image image, ManualResizeRedaction manualResizeRedaction) {
+
+        if (manualResizeRedaction.getPositions().isEmpty() || manualResizeRedaction.getPositions() == null) {
+            return;
+        }
+        var bBox = RectangleTransformations.rectangle2DBBox(manualResizeRedaction.getPositions().stream().map(ManualRedactionApplicationService::toRectangle2D).toList());
+        image.setPosition(bBox);
+    }
+
+
+    private 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());
+    }
+
+}
@@ -0,0 +1,187 @@
+package com.iqser.red.service.redaction.v1.server.document.utils;
+
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RectangularShape;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+
+
+import com.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 lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+public class RectangleTransformations {
+
+
+    public static Rectangle2D atomicTextBlockBBox(List<AtomicTextBlock> atomicTextBlocks) {
+
+        return atomicTextBlocks.stream().flatMap(atomicTextBlock -> atomicTextBlock.getPositions().stream()).collect(new Rectangle2DBBoxCollector());
+    }
+
+
+    public static Rectangle2D rectangleBBox(List<Rectangle> rectangles) {
+
+        return rectangles.stream().map(RectangleTransformations::toRectangle2D).collect(new Rectangle2DBBoxCollector());
+    }
+
+
+    public static Rectangle2D toRectangle2D(Rectangle redactionLogRectangle) {
+
+        return new Rectangle2D.Double(redactionLogRectangle.getTopLeft().getX(),
+                redactionLogRectangle.getTopLeft().getY() + redactionLogRectangle.getHeight(),
+                redactionLogRectangle.getWidth(),
+                -redactionLogRectangle.getHeight());
+    }
+
+
+    public static Rectangle toRedactionLogRectangle(Rectangle2D rectangle2D, int pageNumber) {
+
+        return new Rectangle(new Point((float) rectangle2D.getMinX(), (float) (rectangle2D.getMinY() + rectangle2D.getHeight())),
+                (float) rectangle2D.getWidth(),
+                -(float) rectangle2D.getHeight(),
+                pageNumber);
+    }
+
+
+    public static Rectangle2D rectangle2DBBox(List<Rectangle2D> rectangle2DList) {
+
+        return rectangle2DList.stream().collect(new Rectangle2DBBoxCollector());
+    }
+
+
+    /**
+     * If two rectangles are further apart than five times the average width of a rectangle, a gap is inserted.
+     *
+     * @param rectangle2DList A list of rectangles to combine
+     * @return A list of rectangles which are combined if they are closer than the split threshold
+     */
+    public static List<Rectangle2D> rectangleBBoxWithGaps(List<Rectangle2D> rectangle2DList) {
+
+        if (rectangle2DList.isEmpty()) {
+            return Collections.emptyList();
+        }
+        double splitThreshold = rectangle2DList.stream().mapToDouble(RectangularShape::getWidth).average().orElse(5) * 5.0;
+
+        List<List<Rectangle2D>> rectangleListsWithGaps = new LinkedList<>();
+        List<Rectangle2D> rectangleListWithoutGaps = new LinkedList<>();
+        rectangleListsWithGaps.add(rectangleListWithoutGaps);
+        Rectangle2D previousRectangle = rectangle2DList.get(0);
+        for (Rectangle2D currentRectangle : rectangle2DList) {
+            if (Math.abs(currentRectangle.getMinX() - previousRectangle.getMaxX()) > splitThreshold) {
+                rectangleListWithoutGaps = new LinkedList<>();
+                rectangleListWithoutGaps.add(currentRectangle);
+                rectangleListsWithGaps.add(rectangleListWithoutGaps);
+                previousRectangle = currentRectangle;
+            } else {
+                rectangleListWithoutGaps.add(currentRectangle);
+                previousRectangle = currentRectangle;
+            }
+        }
+        return rectangleListsWithGaps.stream().map(RectangleTransformations::rectangle2DBBox).toList();
+    }
+
+
+    private static class Rectangle2DBBoxCollector implements Collector<Rectangle2D, Rectangle2DBBoxCollector.BBox, Rectangle2D> {
+
+        @Override
+        public Supplier<BBox> supplier() {
+
+            return BBox::new;
+        }
+
+
+        @Override
+        public BiConsumer<BBox, Rectangle2D> accumulator() {
+
+            return BBox::addRectangle;
+        }
+
+
+        @Override
+        public BinaryOperator<BBox> combiner() {
+
+            return (b1, b2) -> new BBox(Math.min(b1.lowerLeftX, b2.lowerLeftX),
+                    Math.min(b1.lowerLeftY, b2.lowerLeftY),
+                    Math.max(b1.upperRightX, b2.upperRightX),
+                    Math.max(b1.upperRightY, b2.upperRightY));
+        }
+
+
+        @Override
+        public Function<BBox, Rectangle2D> finisher() {
+
+            return BBox::toRectangle2D;
+        }
+
+
+        @Override
+        public Set<Characteristics> characteristics() {
+
+            return Set.of(Characteristics.UNORDERED);
+        }
+
+
+        @AllArgsConstructor
+        @NoArgsConstructor
+        private static class BBox {
+
+            Double lowerLeftX;
+            Double lowerLeftY;
+            Double upperRightX;
+            Double upperRightY;
+
+
+            public Rectangle2D toRectangle2D() {
+
+                if (lowerLeftX == null || lowerLeftY == null || upperRightX == null || upperRightY == null) {
+                    return new Rectangle2D.Double(0, 0, 0, 0);
+                }
+                return new Rectangle2D.Double(lowerLeftX, lowerLeftY, upperRightX - lowerLeftX, upperRightY - lowerLeftY);
+            }
+
+
+            public void addRectangle(Rectangle2D rectangle2D) {
+
+                double lowerLeftX = Math.min(rectangle2D.getMinX(), rectangle2D.getMaxX());
+                double lowerLeftY = Math.min(rectangle2D.getMinY(), rectangle2D.getMaxY());
+                double upperRightX = Math.max(rectangle2D.getMinX(), rectangle2D.getMaxX());
+                double upperRightY = Math.max(rectangle2D.getMinY(), rectangle2D.getMaxY());
+
+                if (this.lowerLeftX == null) {
+                    this.lowerLeftX = lowerLeftX;
+                } else if (this.lowerLeftX > lowerLeftX) {
+                    this.lowerLeftX = lowerLeftX;
+                }
+                if (this.lowerLeftY == null) {
+                    this.lowerLeftY = lowerLeftY;
+                } else if (this.lowerLeftY > lowerLeftY) {
+                    this.lowerLeftY = lowerLeftY;
+                }
+                if (this.upperRightX == null) {
+                    this.upperRightX = upperRightX;
+                } else if (this.upperRightX < upperRightX) {
+                    this.upperRightX = upperRightX;
+                }
+                if (this.upperRightY == null) {
+                    this.upperRightY = upperRightY;
+                } else if (this.upperRightY < upperRightY) {
+                    this.upperRightY = upperRightY;
+                }
+
+            }
+
+        }
+
+    }
+
+}
@@ -0,0 +1,182 @@
+package com.iqser.red.service.redaction.v1.server.document.utils;
+
+import static java.lang.String.format;
+
+import java.awt.geom.Rectangle2D;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+
+import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
+import com.iqser.red.service.redaction.v1.server.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class RedactionSearchUtility {
+
+    public static boolean anyMatch(CharSequence charSequence, String regexPattern) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        return pattern.matcher(charSequence).find();
+    }
+
+
+    public static boolean anyMatchIgnoreCase(CharSequence charSequence, String regexPattern) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, true);
+        return pattern.matcher(charSequence).find();
+    }
+
+
+    public static boolean exactMatch(CharSequence charSequence, String regexPattern) {
+
+        return charSequence.toString().matches(regexPattern);
+    }
+
+
+    public static boolean anyMatchIgnoreCase(TextBlock textBlock, String regexPattern) {
+
+        return anyMatchIgnoreCase(textBlock.getSearchText(), regexPattern);
+    }
+
+
+    public static boolean anyMatch(TextBlock textBlock, String regexPattern) {
+
+        return anyMatch(textBlock.getSearchText(), regexPattern);
+    }
+
+
+    public static Boundary findFirstBoundary(String regexPattern, CharSequence searchText) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        Matcher matcher = pattern.matcher(searchText);
+        if (matcher.find()) {
+            return new Boundary(matcher.start(), matcher.end());
+        }
+        throw new IllegalArgumentException(format("Charsequence %s does not contain any matches for pattern %s", searchText, regexPattern));
+    }
+
+
+    public static int getExpandedEndByRegex(RedactionEntity entity, String regexPattern) {
+
+        int expandedEnd;
+        if (anyMatch(entity.getTextAfter(), regexPattern)) {
+            Boundary postfixBoundary = findFirstBoundary(regexPattern, entity.getTextAfter());
+            expandedEnd = postfixBoundary.end() + entity.getBoundary().end();
+        } else {
+            expandedEnd = entity.getBoundary().end();
+        }
+        return expandedEnd;
+    }
+
+
+    public static int getExpandedStartByRegex(RedactionEntity entity, String regexPattern) {
+
+        int expandedStart;
+        if (anyMatch(entity.getTextBefore(), regexPattern)) {
+            Boundary prefixBoundary = findFirstBoundary(regexPattern, entity.getTextBefore());
+            expandedStart = prefixBoundary.start() + entity.getBoundary().start() - entity.getTextBefore().length();
+        } else {
+            expandedStart = entity.getBoundary().start();
+        }
+        return expandedStart;
+    }
+
+    public static Boundary findBoundaryOfAllLinesInYRange(double maxY, double minY, TextBlock textBlock) {
+
+        List<Boundary> lineBoundaries = IntStream.range(0, textBlock.numberOfLines()).boxed().map(textBlock::getLineBoundary).filter(lineBoundary -> isWithinYRange(maxY, minY, textBlock, lineBoundary)).toList();
+        if (lineBoundaries.isEmpty()) {
+            return new Boundary(textBlock.getBoundary().start(), textBlock.getBoundary().start());
+        }
+        return Boundary.merge(lineBoundaries);
+    }
+
+
+    private static boolean isWithinYRange(double maxY, double minY, TextBlock textBlock, Boundary lineBoundary) {
+
+        Rectangle2D lineBBox = RectangleTransformations.rectangle2DBBox(textBlock.getPositions(lineBoundary));
+        return lineBBox.getMinY() < maxY && minY < lineBBox.getMaxY();
+    }
+
+
+    public static List<Boundary> findBoundariesByRegex(String regexPattern, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        return getBoundariesByPattern(textBlock, 0, pattern);
+
+    }
+
+
+    public static List<Boundary> findBoundariesByRegex(String regexPattern, int group, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, false);
+        return getBoundariesByPattern(textBlock, group, pattern);
+    }
+
+
+    public static List<Boundary> findBoundariesByRegexWithLineBreaks(String regexPattern, int group, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, false);
+        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
+    }
+
+
+    public static List<Boundary> findBoundariesByRegexWithLineBreaksIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledMultilinePattern(regexPattern, true);
+        return getBoundariesByPatternWithLineBreaks(textBlock, group, pattern);
+    }
+
+
+    public static List<Boundary> findBoundariesByRegexIgnoreCase(String regexPattern, int group, TextBlock textBlock) {
+
+        Pattern pattern = Patterns.getCompiledPattern(regexPattern, true);
+        return getBoundariesByPattern(textBlock, group, pattern);
+    }
+
+
+    private static List<Boundary> getBoundariesByPattern(TextBlock textBlock, int group, Pattern pattern) {
+
+        Matcher matcher = pattern.matcher(textBlock.subSequence(textBlock.getBoundary()));
+        List<Boundary> boundaries = new LinkedList<>();
+        while (matcher.find()) {
+            boundaries.add(new Boundary(matcher.start(group) + textBlock.getBoundary().start(), matcher.end(group) + textBlock.getBoundary().start()));
+        }
+        return boundaries;
+    }
+
+
+    private static List<Boundary> getBoundariesByPatternWithLineBreaks(TextBlock textBlock, int group, Pattern pattern) {
+
+        String searchTextWithLineBreaks = textBlock.searchTextWithLineBreaks();
+        Matcher matcher = pattern.matcher(searchTextWithLineBreaks);
+        List<Boundary> boundaries = new LinkedList<>();
+        while (matcher.find()) {
+            boundaries.add(new Boundary(matcher.start(group) + textBlock.getBoundary().start(), matcher.end(group) + textBlock.getBoundary().start()));
+        }
+        return boundaries;
+    }
+
+
+    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;
+    }
+
+
+    public static List<Boundary> findBoundariesByStringIgnoreCase(String searchString, TextBlock textBlock) {
+
+        Pattern pattern = Pattern.compile(Pattern.quote(searchString), Pattern.CASE_INSENSITIVE);
+        return getBoundariesByPattern(textBlock, 0, pattern);
+    }
+
+}
@@ -1,27 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import java.util.concurrent.Executor;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-@Configuration
-public class AsyncConfig extends AsyncConfigurerSupport {
-
-    @Override
-    public Executor getAsyncExecutor() {
-
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-
-        executor.setCorePoolSize(7);
-        executor.setMaxPoolSize(42);
-        executor.setQueueCapacity(11);
-        executor.setThreadNamePrefix("TenantAwareTaskExecutor-");
-        executor.setTaskDecorator(new TenantAwareTaskDecorator());
-        executor.initialize();
-
-        return executor;
-    }
-
-}
@@ -1,105 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-import java.security.spec.KeySpec;
-import java.util.Base64;
-
-import javax.annotation.PostConstruct;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import lombok.SneakyThrows;
-
-@Service
-public class EncryptionDecryptionService {
-
-    @Value("${redaction-service.crypto.key:redaction}")
-    private String key;
-
-    private SecretKey secretKey;
-    private byte[] iv;
-
-
-    @SneakyThrows
-    @PostConstruct
-    protected void postConstruct() {
-
-        SecureRandom secureRandom = new SecureRandom();
-        iv = new byte[12];
-        secureRandom.nextBytes(iv);
-        secretKey = generateSecretKey(key, iv);
-    }
-
-
-    @SneakyThrows
-    public String encrypt(String strToEncrypt) {
-
-        return Base64.getEncoder().encodeToString(encrypt(strToEncrypt.getBytes()));
-    }
-
-
-    @SneakyThrows
-    public String decrypt(String strToDecrypt) {
-
-        byte[] bytes = Base64.getDecoder().decode(strToDecrypt);
-        return new String(decrypt(bytes), StandardCharsets.UTF_8);
-    }
-
-
-    @SneakyThrows
-    public byte[] encrypt(byte[] data) {
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, parameterSpec);
-        byte[] encryptedData = cipher.doFinal(data);
-        ByteBuffer byteBuffer = ByteBuffer.allocate(4 + iv.length + encryptedData.length);
-        byteBuffer.putInt(iv.length);
-        byteBuffer.put(iv);
-        byteBuffer.put(encryptedData);
-        return byteBuffer.array();
-    }
-
-
-    @SneakyThrows
-    public byte[] decrypt(byte[] encryptedData) {
-
-        ByteBuffer byteBuffer = ByteBuffer.wrap(encryptedData);
-        int noonceSize = byteBuffer.getInt();
-        if (noonceSize < 12 || noonceSize >= 16) {
-            throw new IllegalArgumentException("Nonce size is incorrect. Make sure that the incoming data is an AES encrypted file.");
-        }
-        byte[] iv = new byte[noonceSize];
-        byteBuffer.get(iv);
-
-        SecretKey secretKey = generateSecretKey(key, iv);
-
-        byte[] cipherBytes = new byte[byteBuffer.remaining()];
-        byteBuffer.get(cipherBytes);
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, parameterSpec);
-        return cipher.doFinal(cipherBytes);
-    }
-
-
-    @SneakyThrows
-    public SecretKey generateSecretKey(String password, byte[] iv) {
-
-        KeySpec spec = new PBEKeySpec(password.toCharArray(), iv, 65536, 128); // AES-128
-        SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
-        byte[] key = secretKeyFactory.generateSecret(spec).getEncoded();
-        return new SecretKeySpec(key, "AES");
-    }
-
-}
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import org.springframework.stereotype.Component;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-
-@Component
-public class ForwardTenantInterceptor implements RequestInterceptor {
-
-    public static final String TENANT_HEADER_NAME = "X-TENANT-ID";
-
-    @Override
-    public void apply(RequestTemplate template) {
-        template.header(TENANT_HEADER_NAME, TenantContext.getTenantId());
-    }
-}
@@ -1,49 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-
-import static com.iqser.red.service.redaction.v1.server.multitenancy.ForwardTenantInterceptor.TENANT_HEADER_NAME;
-
-import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MultiTenancyMessagingConfiguration {
-
-    @Bean
-    public static BeanPostProcessor multitenancyBeanPostProcessor() {
-
-        return new BeanPostProcessor() {
-
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-
-                if (bean instanceof RabbitTemplate) {
-
-                    ((RabbitTemplate) bean).setBeforePublishPostProcessors(m -> {
-                        m.getMessageProperties().setHeader(TENANT_HEADER_NAME, TenantContext.getTenantId());
-                        return m;
-                    });
-
-                } else if (bean instanceof AbstractRabbitListenerContainerFactory) {
-
-                    ((AbstractRabbitListenerContainerFactory<?>) bean).setAfterReceivePostProcessors(m -> {
-                        String tenant = m.getMessageProperties().getHeader(TENANT_HEADER_NAME);
-
-                        if (tenant != null) {
-                            TenantContext.setTenantId(tenant);
-                        } else {
-                            throw new RuntimeException("No Tenant is set queue message");
-                        }
-                        return m;
-                    });
-                }
-                return bean;
-            }
-        };
-    }
-
-}
@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-
-@Configuration
-public class MultiTenancyWebConfiguration extends DefaultWebMvcConfiguration {
-
-    private final TenantInterceptor tenantInterceptor;
-
-
-    @Autowired
-    public MultiTenancyWebConfiguration(TenantInterceptor tenantInterceptor) {
-
-        this.tenantInterceptor = tenantInterceptor;
-    }
-
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-        registry.addWebRequestInterceptor(tenantInterceptor);
-    }
-
-}
@@ -1,45 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.client.TenantsClient;
-import com.iqser.red.storage.commons.model.AzureStorageConnection;
-import com.iqser.red.storage.commons.model.S3StorageConnection;
-import com.iqser.red.storage.commons.service.StorageConnectionProvider;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class StorageConnectionProviderImpl implements StorageConnectionProvider {
-
-    private final TenantsClient tenantsClient;
-    private final EncryptionDecryptionService encryptionDecryptionService;
-
-
-    @Override
-    public AzureStorageConnection getAzureStorageConnection(String tenantId) {
-
-        var tenant = tenantsClient.getTenant(tenantId);
-        return AzureStorageConnection.builder()
-                .connectionString(encryptionDecryptionService.decrypt(tenant.getAzureStorageConnection().getConnectionString()))
-                .containerName(tenant.getAzureStorageConnection().getContainerName())
-                .build();
-    }
-
-
-    @Override
-    public S3StorageConnection getS3StorageConnection(String tenantId) {
-
-        var tenant = tenantsClient.getTenant(tenantId);
-        return S3StorageConnection.builder()
-                .key(tenant.getS3StorageConnection().getKey())
-                .secret(encryptionDecryptionService.decrypt(tenant.getS3StorageConnection().getSecret()))
-                .signerType(tenant.getS3StorageConnection().getSignerType())
-                .bucketName(tenant.getS3StorageConnection().getBucketName())
-                .region(tenant.getS3StorageConnection().getRegion())
-                .endpoint(tenant.getS3StorageConnection().getEndpoint())
-                .build();
-    }
-
-}
@@ -1,23 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import org.springframework.core.task.TaskDecorator;
-import org.springframework.lang.NonNull;
-
-public class TenantAwareTaskDecorator implements TaskDecorator {
-
-    @Override
-    @NonNull
-    public Runnable decorate(@NonNull Runnable runnable) {
-
-        String tenantId = TenantContext.getTenantId();
-        return () -> {
-            try {
-                TenantContext.setTenantId(tenantId);
-                runnable.run();
-            } finally {
-                TenantContext.setTenantId(null);
-            }
-        };
-    }
-
-}
@@ -1,29 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public final class TenantContext {
-
-    private static InheritableThreadLocal<String> currentTenant = new InheritableThreadLocal<>();
-
-
-    public static void setTenantId(String tenantId) {
-
-        log.debug("Setting tenantId to " + tenantId);
-        currentTenant.set(tenantId);
-    }
-
-
-    public static String getTenantId() {
-
-        return currentTenant.get();
-    }
-
-
-    public static void clear() {
-
-        currentTenant.remove();
-    }
-
-}
@@ -1,35 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.multitenancy;
-
-import org.springframework.stereotype.Component;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.WebRequestInterceptor;
-
-@Component
-public class TenantInterceptor implements WebRequestInterceptor {
-
-    public static final String TENANT_HEADER_NAME = "X-TENANT-ID";
-
-
-    @Override
-    public void preHandle(WebRequest request) {
-
-        if (request.getHeader(TENANT_HEADER_NAME) != null) {
-            TenantContext.setTenantId(request.getHeader(TENANT_HEADER_NAME));
-        }
-    }
-
-
-    @Override
-    public void postHandle(WebRequest request, ModelMap model) {
-
-        TenantContext.clear();
-    }
-
-
-    @Override
-    public void afterCompletion(WebRequest request, Exception ex) {
-
-    }
-
-}
@@ -1,386 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.iqser.red.service.redaction.v1.server.parsing;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.fontbox.ttf.TrueTypeFont;
-import org.apache.fontbox.util.BoundingBox;
-
-import org.apache.pdfbox.contentstream.PDFStreamEngine;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDCIDFont;
-import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
-import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
-import org.apache.pdfbox.pdmodel.font.PDType0Font;
-import org.apache.pdfbox.pdmodel.font.PDType3Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.pdfbox.util.Matrix;
-import org.apache.pdfbox.util.Vector;
-import org.apache.pdfbox.contentstream.operator.DrawObject;
-import org.apache.pdfbox.contentstream.operator.state.Concatenate;
-import org.apache.pdfbox.contentstream.operator.state.Restore;
-import org.apache.pdfbox.contentstream.operator.state.Save;
-import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
-import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
-import org.apache.pdfbox.contentstream.operator.text.BeginText;
-import org.apache.pdfbox.contentstream.operator.text.EndText;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
-import org.apache.pdfbox.contentstream.operator.text.MoveText;
-import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
-import org.apache.pdfbox.contentstream.operator.text.NextLine;
-import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
-import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
-import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
-import org.apache.pdfbox.contentstream.operator.text.ShowText;
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
-
-/**
- * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
- * <p>
- * This class exists only so that we don't break the code of users who have their own subclasses of
- * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
- * with a heuristic implementation which is backwards compatible.
- * <p>
- * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
- * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
- */
-@SuppressWarnings({"PMD", "checkstyle:all"})
-class LegacyPDFStreamEngine extends PDFStreamEngine {
-
-    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
-
-    private int pageRotation;
-    private PDRectangle pageSize;
-    private Matrix translateMatrix;
-    private final GlyphList glyphList;
-    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
-
-
-    /**
-     * Constructor.
-     */
-    LegacyPDFStreamEngine() throws IOException {
-
-        addOperator(new BeginText());
-        addOperator(new Concatenate());
-        addOperator(new DrawObject()); // special text version
-        addOperator(new EndText());
-        addOperator(new SetGraphicsStateParameters());
-        addOperator(new Save());
-        addOperator(new Restore());
-        addOperator(new NextLine());
-        addOperator(new SetCharSpacing());
-        addOperator(new MoveText());
-        addOperator(new MoveTextSetLeading());
-        addOperator(new SetFontAndSize());
-        addOperator(new ShowText());
-        addOperator(new ShowTextAdjusted());
-        addOperator(new SetTextLeading());
-        addOperator(new SetMatrix());
-        addOperator(new SetTextRenderingMode());
-        addOperator(new SetTextRise());
-        addOperator(new SetWordSpacing());
-        addOperator(new SetTextHorizontalScaling());
-        addOperator(new ShowTextLine());
-        addOperator(new ShowTextLineAndSpace());
-
-        // load additional glyph list for Unicode mapping
-        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
-        InputStream input = GlyphList.class.getResourceAsStream(path);
-        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
-    }
-
-
-    /**
-     * This will initialize and process the contents of the stream.
-     *
-     * @param page the page to process
-     * @throws java.io.IOException if there is an error accessing the stream.
-     */
-    @Override
-    public void processPage(PDPage page) throws IOException {
-
-        this.pageRotation = page.getRotation();
-        this.pageSize = page.getCropBox();
-
-        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0) {
-            translateMatrix = null;
-        } else {
-            // translation matrix for cropbox
-            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
-        }
-        super.processPage(page);
-    }
-
-
-    /**
-     * Called when a glyph is to be processed. The heuristic calculations here were originally
-     * written by Ben Litchfield for PDFStreamEngine.
-     */
-    @Override
-    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) throws IOException {
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        PDGraphicsState state = getGraphicsState();
-        Matrix ctm = state.getCurrentTransformationMatrix();
-        float fontSize = state.getTextState().getFontSize();
-        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
-        Matrix textMatrix = getTextMatrix();
-
-        float displacementX = displacement.getX();
-        // the sorting algorithm is based on the width of the character. As the displacement
-        // for vertical characters doesn't provide any suitable value for it, we have to 
-        // calculate our own
-        if (font.isVertical()) {
-            displacementX = font.getWidth(code) / 1000;
-            // there may be an additional scaling factor for true type fonts
-            TrueTypeFont ttf = null;
-            if (font instanceof PDTrueTypeFont) {
-                ttf = ((PDTrueTypeFont) font).getTrueTypeFont();
-            } else if (font instanceof PDType0Font) {
-                PDCIDFont cidFont = ((PDType0Font) font).getDescendantFont();
-                if (cidFont instanceof PDCIDFontType2) {
-                    ttf = ((PDCIDFontType2) cidFont).getTrueTypeFont();
-                }
-            }
-            if (ttf != null && ttf.getUnitsPerEm() != 1000) {
-                displacementX *= 1000f / ttf.getUnitsPerEm();
-            }
-        }
-
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        // (modified) combined displacement, this is calculated *without* taking the character
-        // spacing and word spacing into account, due to legacy code in TextStripper
-        float tx = displacementX * fontSize * horizontalScaling;
-        float ty = displacement.getY() * fontSize;
-
-        // (modified) combined displacement matrix
-        Matrix td = Matrix.getTranslateInstance(tx, ty);
-
-        // (modified) text rendering matrix
-        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
-        float nextX = nextTextRenderingMatrix.getTranslateX();
-        float nextY = nextTextRenderingMatrix.getTranslateY();
-
-        // (modified) width and height calculations
-        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
-        Float fontHeight = fontHeightMap.get(font.getCOSObject());
-        if (fontHeight == null) {
-            fontHeight = computeFontHeight(font);
-            fontHeightMap.put(font.getCOSObject(), fontHeight);
-        }
-        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
-
-        //
-        // start of the original method
-        //
-
-        // Note on variable names. There are three different units being used in this code.
-        // Character sizes are given in glyph units, text locations are initially given in text
-        // units, and we want to save the data in display units. The variable names should end with
-        // Text or Disp to represent if the values are in text or disp units (no glyph units are
-        // saved).
-
-        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
-        if (font instanceof PDType3Font) {
-            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
-        }
-
-        float spaceWidthText = 0;
-        try {
-            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
-            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
-        } catch (Throwable exception) {
-            LOG.warn(exception, exception);
-        }
-
-        if (spaceWidthText == 0) {
-            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
-            // the average space width appears to be higher than necessary so make it smaller
-            spaceWidthText *= .80f;
-        }
-        if (spaceWidthText == 0) {
-            spaceWidthText = 1.0f; // if could not find font, use a generic value
-        }
-
-        // the space width has to be transformed into display units
-        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
-
-        // use our additional glyph list for Unicode mapping
-        String unicodeMapping = font.toUnicode(code, glyphList);
-
-        // when there is no Unicode mapping available, Acrobat simply coerces the character code
-        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
-        // this, which is why we leave it until this point in PDFTextStreamEngine.
-        if (unicodeMapping == null) {
-            if (font instanceof PDSimpleFont) {
-                char c = (char) code;
-                unicodeMapping = new String(new char[]{c});
-            } else {
-                // Acrobat doesn't seem to coerce composite font's character codes, instead it
-                // skips them. See the "allah2.pdf" TestTextStripper file.
-                return;
-            }
-        }
-
-        // adjust for cropbox if needed
-        Matrix translatedTextRenderingMatrix;
-        if (translateMatrix == null) {
-            translatedTextRenderingMatrix = textRenderingMatrix;
-        } else {
-            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
-            nextX -= pageSize.getLowerLeftX();
-            nextY -= pageSize.getLowerLeftY();
-        }
-
-        // This is a hack for unicode letter with 2 chars e.g. RA see unicodeProblem.pdf
-        if (unicodeMapping.length() == 2) {
-            processTextPosition(new TextPosition(pageRotation,
-                    pageSize.getWidth(),
-                    pageSize.getHeight(),
-                    translatedTextRenderingMatrix,
-                    nextX,
-                    nextY,
-                    Math.abs(dyDisplay),
-                    dxDisplay,
-                    Math.abs(spaceWidthDisplay),
-                    Character.toString(unicodeMapping.charAt(0)),
-                    new int[]{code},
-                    font,
-                    fontSize,
-                    (int) (fontSize * textMatrix.getScalingFactorX())));
-            processTextPosition(new TextPosition(pageRotation,
-                    pageSize.getWidth(),
-                    pageSize.getHeight(),
-                    translatedTextRenderingMatrix,
-                    nextX,
-                    nextY,
-                    Math.abs(dyDisplay),
-                    dxDisplay,
-                    Math.abs(spaceWidthDisplay),
-                    Character.toString(unicodeMapping.charAt(1)),
-                    new int[]{code},
-                    font,
-                    fontSize,
-                    (int) (fontSize * textMatrix.getScalingFactorX())));
-        } else {
-
-            processTextPosition(new TextPosition(pageRotation,
-                    pageSize.getWidth(),
-                    pageSize.getHeight(),
-                    translatedTextRenderingMatrix,
-                    nextX,
-                    nextY,
-                    Math.abs(dyDisplay),
-                    dxDisplay,
-                    Math.abs(spaceWidthDisplay),
-                    unicodeMapping,
-                    new int[]{code},
-                    font,
-                    fontSize,
-                    (int) (fontSize * textMatrix.getScalingFactorX())));
-        }
-    }
-
-
-    /**
-     * Compute the font height. Override this if you want to use own calculations.
-     *
-     * @param font the font.
-     * @return the font height.
-     * @throws IOException if there is an error while getting the font bounding box.
-     */
-    protected float computeFontHeight(PDFont font) throws IOException {
-
-        BoundingBox bbox = font.getBoundingBox();
-        if (bbox.getLowerLeftY() < Short.MIN_VALUE) {
-            // PDFBOX-2158 and PDFBOX-3130
-            // files by Salmat eSolutions / ClibPDF Library
-            bbox.setLowerLeftY(-(bbox.getLowerLeftY() + 65536));
-        }
-        // 1/2 the bbox is used as the height todo: why?
-        float glyphHeight = bbox.getHeight() / 2;
-
-        // sometimes the bbox has very high values, but CapHeight is OK
-        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
-        if (fontDescriptor != null) {
-            float capHeight = fontDescriptor.getCapHeight();
-            if (Float.compare(capHeight, 0) != 0 && (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0)) {
-                glyphHeight = capHeight;
-            }
-            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
-            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
-            float ascent = fontDescriptor.getAscent();
-            float descent = fontDescriptor.getDescent();
-            if (capHeight > ascent && ascent > 0 && descent < 0 && ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0)) {
-                glyphHeight = (ascent - descent) / 2;
-            }
-        }
-
-        // transformPoint from glyph space -> text space
-        float height;
-        if (font instanceof PDType3Font) {
-            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
-        } else {
-            height = glyphHeight / 1000;
-        }
-
-        return height;
-    }
-
-
-    /**
-     * A method provided as an event interface to allow a subclass to perform some specific
-     * functionality when text needs to be processed.
-     *
-     * @param text The text to be processed.
-     */
-    protected void processTextPosition(TextPosition text) {
-        // subclasses can override to provide specific functionality
-    }
-
-}
@@ -1,82 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing;
-
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class PDFAreaTextStripper extends PDFTextStripperByArea {
-
-    @Getter
-    private List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-
-    @Setter
-    private int pageNumber;
-
-
-    public PDFAreaTextStripper() throws IOException {
-
-    }
-
-
-    @Override
-    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
-
-        int startIndex = 0;
-        for (int i = 0; i <= textPositions.size() - 1; i++) {
-
-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
-                startIndex++;
-                continue;
-            }
-
-            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0")) && i <= textPositions.size() - 2) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i + 1;
-            }
-        }
-
-        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
-            sublist = sublist.subList(0, sublist.size() - 1);
-        }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-        }
-        super.writeString(text);
-    }
-
-
-    public void clearPositions() {
-
-        textPositionSequences = new ArrayList<>();
-    }
-
-}
@@ -1,318 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing;
-
-import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.text.TextPosition;
-
-import java.awt.geom.Point2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-@Slf4j
-public class PDFLinesTextStripper extends PDFTextStripper {
-
-    @Getter
-    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-    @Getter
-    private final List<Ruling> rulings = new ArrayList<>();
-    private final List<Ruling> graphicsPath = new ArrayList<>();
-    @Setter
-    protected PDPage pdpage;
-    @Getter
-    private int minCharWidth;
-    @Getter
-    private int maxCharWidth;
-    @Getter
-    private int minCharHeight;
-    @Getter
-    private int maxCharHeight;
-
-    private float path_x;
-    private float path_y;
-
-    @Setter
-    private int pageNumber;
-
-
-    public PDFLinesTextStripper() throws IOException {
-
-        super();
-        this.addOperator(new SetStrokingColorSpace());
-        this.addOperator(new SetNonStrokingColorSpace());
-        this.addOperator(new SetLineDashPattern());
-        this.addOperator(new SetStrokingDeviceGrayColor());
-        this.addOperator(new SetNonStrokingDeviceGrayColor());
-        this.addOperator(new SetFlatness());
-        this.addOperator(new SetLineJoinStyle());
-        this.addOperator(new SetLineCapStyle());
-        this.addOperator(new SetStrokingDeviceCMYKColor());
-        this.addOperator(new SetNonStrokingDeviceCMYKColor());
-        this.addOperator(new SetLineMiterLimit());
-        this.addOperator(new SetStrokingDeviceRGBColor());
-        this.addOperator(new SetNonStrokingDeviceRGBColor());
-        this.addOperator(new SetRenderingIntent());
-        this.addOperator(new SetStrokingColor());
-        this.addOperator(new SetNonStrokingColor());
-        this.addOperator(new SetStrokingColorN());
-        this.addOperator(new SetNonStrokingColorN());
-        this.addOperator(new SetFontAndSize());
-        this.addOperator(new SetLineWidth());
-    }
-
-
-    @Override
-    protected void processOperator(Operator operator, List<COSBase> arguments) throws IOException {
-
-        String operation = operator.getName();
-
-        //move
-        switch (operation) {
-            case OperatorName.MOVE_TO:
-                if (arguments.size() == 2) {
-                    Point2D.Float pos = transformPosition(floatValue(arguments.get(0)), floatValue(arguments.get(1)));
-                    path_x = (float) pos.getX();
-                    path_y = (float) pos.getY();
-                }
-                break;
-
-            //line
-            case OperatorName.LINE_TO:
-                if (arguments.size() == 2) {
-                    Point2D.Float pos = transformPosition(floatValue(arguments.get(0)), floatValue(arguments.get(1)));
-
-                    // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
-                    if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
-                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
-                    }
-
-                    path_x = (float) pos.getX();
-                    path_y = (float) pos.getY();
-                }
-                break;
-
-            //rectangle
-            case OperatorName.APPEND_RECT:
-
-                if (arguments.size() == 4) {
-                    float x = floatValue(arguments.get(0));
-                    float y = floatValue(arguments.get(1));
-                    float width = floatValue(arguments.get(2));
-                    float height = floatValue(arguments.get(3));
-
-                    Point2D p1 = transformPosition(x, y);
-                    Point2D p2 = transformPosition(x + width, y + height);
-
-                    // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
-
-                    // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
-                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
-                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    }
-                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
-                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
-                    }
-                }
-                break;
-
-            //fill
-            case OperatorName.FILL_NON_ZERO:
-            case OperatorName.LEGACY_FILL_NON_ZERO:
-            case OperatorName.FILL_EVEN_ODD:
-                addVisibleRulings(graphicsPath, false);
-                graphicsPath.clear();
-                break;
-
-            //stroke
-            case OperatorName.STROKE_PATH:
-                addVisibleRulings(graphicsPath, true);
-                graphicsPath.clear();
-                break;
-
-            //cancel path
-            case OperatorName.ENDPATH:
-                graphicsPath.clear();
-                break;
-
-        }
-
-        super.processOperator(operator, arguments);
-    }
-
-
-    private float floatValue(COSBase value) {
-
-        if (value instanceof COSNumber) {
-            return ((COSNumber) value).floatValue();
-        } else {
-            return 0;
-        }
-    }
-
-
-    private Point2D.Float transformPosition(float x, float y) {
-
-        return super.transformedPoint(x, y);
-    }
-
-
-    private void addVisibleRulings(List<Ruling> path, boolean stroke) throws IOException {
-
-        try {
-            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
-                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
-                rulings.addAll(path);
-            }
-        } catch (UnsupportedOperationException e) {
-            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor()
-                    .getColorSpace()
-                    .getName() + " does not support toRGB");
-        }
-    }
-
-
-    @Override
-    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
-
-        int startIndex = 0;
-        RedTextPosition previous = null;
-
-        textPositions.sort(Comparator.comparing(TextPosition::getXDirAdj));
-
-        for (int i = 0; i <= textPositions.size() - 1; i++) {
-
-            if (!textPositionSequences.isEmpty()) {
-                previous = textPositionSequences.get(textPositionSequences.size() - 1)
-                        .getTextPositions()
-                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
-            }
-
-            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
-            if (charWidth < minCharWidth) {
-                minCharWidth = charWidth;
-            }
-            if (charWidth > maxCharWidth) {
-                maxCharWidth = charWidth;
-            }
-
-            int charHeight = (int) textPositions.get(i).getHeightDir();
-            if (charHeight < minCharHeight) {
-                minCharHeight = charHeight;
-            }
-            if (charWidth > maxCharHeight) {
-                maxCharHeight = charHeight;
-            }
-
-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
-                startIndex++;
-                continue;
-            }
-
-            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                }
-                startIndex = i;
-            }
-
-            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\t")) && i <= textPositions.size() - 2) {
-                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
-
-                    // Remove false sequence ends (whitespaces)
-                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
-                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
-                        for (TextPosition t : sublist) {
-                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
-                        }
-                    } else {
-                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-                    }
-                }
-                startIndex = i + 1;
-            }
-        }
-
-        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1)
-                .getUnicode()
-                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
-            sublist = sublist.subList(0, sublist.size() - 1);
-        }
-
-        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                .getUnicode()
-                .equals("\t")))) {
-            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
-                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
-                for (TextPosition t : sublist) {
-                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
-                }
-            } else {
-                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
-            }
-        }
-        super.writeString(text);
-    }
-
-
-    @Override
-    public String getText(PDDocument doc) throws IOException {
-
-        minCharWidth = Integer.MAX_VALUE;
-        maxCharWidth = 0;
-        minCharHeight = Integer.MAX_VALUE;
-        maxCharHeight = 0;
-        textPositionSequences.clear();
-        rulings.clear();
-        graphicsPath.clear();
-        path_x = 0.0f;
-        path_y = 0.0f;
-
-        return super.getText(doc);
-
-    }
-
-}
@@ -1,106 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.beans.BeanUtils;
-
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@CompiledJson
-public class RedTextPosition {
-
-    private String textMatrix;
-    private float[] position;
-
-    @JsonIgnore
-    private int rotation;
-
-    @JsonIgnore
-    private float pageHeight;
-
-    @JsonIgnore
-    private float pageWidth;
-
-    private String unicode;
-
-    @JsonIgnore
-    private float dir;
-
-    // not used in reanalysis
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    private float widthOfSpace;
-
-    // not used in reanalysis
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    private float fontSizeInPt;
-
-    // not used in reanalysis
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    private String fontName;
-
-
-    @SneakyThrows
-    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
-
-        var pos = new RedTextPosition();
-        BeanUtils.copyProperties(textPosition, pos);
-        pos.setFontName(textPosition.getFont().getName());
-
-        pos.setFontSizeInPt(textPosition.getFontSizeInPt());
-
-        pos.setTextMatrix(textPosition.getTextMatrix().toString());
-
-        var position = new float[4];
-
-        position[0] = textPosition.getXDirAdj();
-        position[1] = textPosition.getYDirAdj();
-        position[2] = textPosition.getWidthDirAdj();
-        position[3] = textPosition.getHeightDir();
-
-        pos.setPosition(position);
-        return pos;
-    }
-
-
-    @JsonIgnore
-    public float getXDirAdj() {
-
-        return position[0];
-    }
-
-
-    @JsonIgnore
-    public float getYDirAdj() {
-
-        return position[1];
-    }
-
-
-    @JsonIgnore
-    public float getWidthDirAdj() {
-
-        return position[2];
-    }
-
-
-    @JsonIgnore
-    public float getHeightDir() {
-
-        return position[3];
-    }
-
-}
@@ -1,70 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import lombok.Getter;
-
-@Getter
-public enum TextDirection {
-    ZERO(0f),
-    QUARTER_CIRCLE(90f),
-    HALF_CIRCLE(180f),
-    THREE_QUARTER_CIRCLE(270f);
-
-    public static final String VALUE_STRING_SUFFIX = "°";
-
-    @JsonValue
-    private final float degrees;
-    private final float radians;
-
-
-    TextDirection(float degreeValue) {
-
-        degrees = degreeValue;
-        radians = (float) Math.toRadians(degreeValue);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return degrees + VALUE_STRING_SUFFIX;
-    }
-
-
-    @com.dslplatform.json.JsonValue
-    public float jsonValue() {
-
-        return getDegrees();
-    }
-
-
-    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
-    public static TextDirection fromDegrees(float degrees) {
-
-        for (var dir : TextDirection.values()) {
-            if (degrees == dir.degrees) {
-                return dir;
-            }
-        }
-
-        throw new IllegalArgumentException(String.format("A value of %f is not supported by TextDirection", degrees));
-    }
-
-
-    public static TextDirection fromString(String degreesAsString) {
-
-        Objects.requireNonNull(degreesAsString, "Cannot construct a text direction from a null value");
-
-        String value = degreesAsString.strip();
-
-        if (degreesAsString.endsWith(VALUE_STRING_SUFFIX)) {
-            value = degreesAsString.replace(VALUE_STRING_SUFFIX + "$", "");
-        }
-
-        return fromDegrees(Float.parseFloat(value));
-    }
-}
@@ -1,316 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.text.TextPosition;
-
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-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 lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Data
-@Builder
-@CompiledJson
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonIgnoreProperties({"empty"})
-public class TextPositionSequence implements CharSequence {
-
-    public static final int HEIGHT_PADDING = 2;
-    private int page;
-    private List<RedTextPosition> textPositions = new ArrayList<>();
-
-    private TextDirection dir;
-    private int rotation;
-    private float pageHeight;
-    private float pageWidth;
-
-
-    public TextPositionSequence(int page) {
-
-        this.page = page;
-    }
-
-
-    public TextPositionSequence(List<TextPosition> textPositions, int page) {
-
-        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
-        this.page = page;
-        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
-        this.rotation = textPositions.get(0).getRotation();
-        this.pageHeight = textPositions.get(0).getPageHeight();
-        this.pageWidth = textPositions.get(0).getPageWidth();
-    }
-
-
-    @Override
-    public int length() {
-
-        return textPositions.size();
-    }
-
-
-    @Override
-    public char charAt(int index) {
-
-        RedTextPosition textPosition = textPositionAt(index);
-        String text = textPosition.getUnicode();
-        return text.charAt(0);
-    }
-
-
-    public char charAt(int index, boolean caseInSensitive) {
-
-        RedTextPosition textPosition = textPositionAt(index);
-        String text = textPosition.getUnicode();
-        return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
-    }
-
-
-    @Override
-    public TextPositionSequence subSequence(int start, int end) {
-
-        var textPositionSequence = new TextPositionSequence();
-        textPositionSequence.textPositions = textPositions.subList(start, end);
-        textPositionSequence.page = page;
-        textPositionSequence.dir = dir;
-        textPositionSequence.rotation = rotation;
-        textPositionSequence.pageHeight = pageHeight;
-        textPositionSequence.pageWidth = pageWidth;
-
-        return textPositionSequence;
-    }
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder builder = new StringBuilder(length());
-        for (int i = 0; i < length(); i++) {
-            builder.append(charAt(i));
-        }
-        return builder.toString();
-    }
-
-
-    public RedTextPosition textPositionAt(int index) {
-
-        return textPositions.get(index);
-    }
-
-
-    public void add(TextPositionSequence textPositionSequence, RedTextPosition textPosition) {
-
-        this.textPositions.add(textPosition);
-        this.page = textPositionSequence.getPage();
-        this.dir = textPositionSequence.getDir();
-        this.rotation = textPositionSequence.getRotation();
-        this.pageHeight = textPositionSequence.getPageHeight();
-        this.pageWidth = textPositionSequence.getPageWidth();
-    }
-
-
-    public void add(TextPosition textPosition) {
-
-        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
-
-        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
-        this.rotation = textPositions.get(0).getRotation();
-        this.pageHeight = textPositions.get(0).getPageHeight();
-        this.pageWidth = textPositions.get(0).getPageWidth();
-
-    }
-
-
-    /**
-     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
-     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
-     *
-     * @return the text direction adjusted minX value
-     */
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getMinXDirAdj() {
-
-        return textPositions.get(0).getXDirAdj();
-
-    }
-
-
-    /**
-     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
-     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
-     *
-     * @return the text direction adjusted maxX value
-     */
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getMaxXDirAdj() {
-
-        return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING;
-
-    }
-
-
-    /**
-     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
-     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
-     *
-     * @return the text direction adjusted minY value. The upper border of the bounding box of the word.
-     */
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getMinYDirAdj() {
-
-        return textPositions.get(0).getYDirAdj() - getTextHeight();
-
-    }
-
-
-    /**
-     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
-     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
-     *
-     * @return the text direction adjusted maxY value. The lower border of the bounding box of the word.
-     */
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getMaxYDirAdj() {
-
-        return textPositions.get(0).getYDirAdj();
-
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getTextHeight() {
-
-        return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getHeight() {
-
-        return getMaxYDirAdj() - getMinYDirAdj();
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getWidth() {
-
-        return getMaxXDirAdj() - getMinXDirAdj();
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public String getFont() {
-
-        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public String getFontStyle() {
-
-        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
-
-        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
-            return "bold, italic";
-        } else if (lowercaseFontName.contains("bold")) {
-            return "bold";
-        } else if (lowercaseFontName.contains("italic")) {
-            return "italic";
-        } else {
-            return "standard";
-        }
-
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getFontSize() {
-
-        return textPositions.get(0).getFontSizeInPt();
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getSpaceWidth() {
-
-        return textPositions.get(0).getWidthOfSpace();
-    }
-
-
-    /**
-     * This returns the bounding box of the word in Pdf Coordinate System where {0,0} rotated with the page rotation.
-     * 0 -> LowerLeft
-     * 90 -> UpperLeft
-     * 180 -> UpperRight
-     * 270 -> LowerRight
-     *
-     * @return bounding box of the word in Pdf Coordinate System
-     */
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    @SneakyThrows
-    public Rectangle getRectangle() {
-
-        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, this, rotation, dir);
-
-        float textHeight = getTextHeight();
-
-        RedTextPosition firstTextPos = textPositions.get(0);
-        RedTextPosition lastTextPos = textPositions.get(textPositions.size() - 1);
-
-        Point2D bottomLeft = new Point2D.Double(firstTextPos.getXDirAdj(), firstTextPos.getYDirAdj() - HEIGHT_PADDING);
-        Point2D topRight = new Point2D.Double(lastTextPos.getXDirAdj() + lastTextPos.getWidthDirAdj(), lastTextPos.getYDirAdj() + textHeight + HEIGHT_PADDING);
-
-        AffineTransform transform = new AffineTransform();
-        if (dir == TextDirection.ZERO || dir == TextDirection.HALF_CIRCLE) {
-            transform.rotate(dir.getRadians(), pageWidth / 2f, pageHeight / 2f);
-            transform.translate(0f, pageHeight + textHeight);
-            transform.scale(1., -1.);
-        } else if (dir == TextDirection.QUARTER_CIRCLE) {
-            transform.rotate(dir.getRadians(), pageWidth / 2f, pageWidth / 2f);
-            transform.translate(0f, pageWidth + textHeight);
-            transform.scale(1., -1.);
-        } else {
-            transform.rotate(dir.getRadians(), pageHeight / 2f, pageHeight / 2f);
-            transform.translate(0f, pageWidth + textHeight);
-            transform.scale(1., -1.);
-        }
-
-        bottomLeft = transform.transform(bottomLeft, null);
-        topRight = transform.transform(topRight, null);
-
-        return new Rectangle( //
-                new Point((float) bottomLeft.getX(), (float) bottomLeft.getY()),
-                (float) (topRight.getX() - bottomLeft.getX()),
-                (float) (topRight.getY() - bottomLeft.getY()),
-                page);
-    }
-
-}
@@ -17,6 +17,9 @@ public class MessagingConfiguration {

    public static final String REDACTION_PRIORITY_QUEUE = "redactionPriorityQueue";

+    public static final String X_ERROR_INFO_HEADER = "x-error-message";
+    public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp";
+

    @Bean
    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false")
@@ -1,6 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.queue;

 import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_PRIORITY_QUEUE;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.X_ERROR_INFO_HEADER;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.X_ERROR_INFO_TIMESTAMP_HEADER;
+import static java.lang.String.format;
+
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;

 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
 import org.springframework.amqp.core.Message;
@@ -8,14 +17,13 @@ import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Service;

-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.analyze.AnalyzeService;

 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -39,9 +47,16 @@ public class RedactionMessageReceiver {

        // This prevents from endless retries oom errors.
        if (message.getMessageProperties().isRedelivered()) {
-            throw new AmqpRejectAndDontRequeueException(String.format("Error during last processing of request with dossierId: %s and fileId: %s, do not retry.",
+            var errorMessage = format("Error during last processing of request with dossierId: %s and fileId: %s, do not retry.",
                    analyzeRequest.getDossierId(),
-                    analyzeRequest.getFileId()));
+                    analyzeRequest.getFileId());
+            fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
+                    analyzeRequest.getFileId(),
+                    new FileErrorInfo(errorMessage,
+                            priority ? REDACTION_PRIORITY_QUEUE : REDACTION_QUEUE,
+                            "redaction-service",
+                            OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS)));
+            throw new AmqpRejectAndDontRequeueException(errorMessage);
        }

        receiveAnalyzeRequest(analyzeRequest, priority);
@@ -51,59 +66,81 @@ public class RedactionMessageReceiver {
    @SneakyThrows
    public void receiveAnalyzeRequest(AnalyzeRequest analyzeRequest, boolean priority) {

-        log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
+        log.info("");
+        log.info("Processing AnalyzeRequest for file: {},  priority: {} ", analyzeRequest.getFileId(), priority);
+        log.info("");
        AnalyzeResult result;

        try {
            switch (analyzeRequest.getMessageType()) {

-                case REANALYSE:
-                    result = analyzeService.reanalyze(analyzeRequest);
-                    log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                    break;
-
-                case STRUCTURE_ANALYSE:
-                    result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-                    log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                    break;
-
                case ANALYSE:
+                    log.info("------------------------------Full Analysis---------------------------------------");
+                    log.info("Starting Analysis for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+                    log.debug(analyzeRequest.getManualRedactions().toString());
                    result = analyzeService.analyze(analyzeRequest);
-                    log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    log.info("Successfully analyzed dossier {} file {} took: {} s",
+                            analyzeRequest.getDossierId(),
+                            analyzeRequest.getFileId(),
+                            format("%.2f", result.getDuration() / 1000.0));
+                    log.info("----------------------------------------------------------------------------------");
+                    break;
+
+                case REANALYSE:
+                    log.info("------------------------------Reanalysis------------------------------------------");
+                    log.info("Starting Reanalysis for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+                    log.debug(analyzeRequest.getManualRedactions().toString());
+                    result = analyzeService.reanalyze(analyzeRequest);
+                    log.info("Successfully reanalyzed dossier {} file {} took: {} s",
+                            analyzeRequest.getDossierId(),
+                            analyzeRequest.getFileId(),
+                            format("%.2f", result.getDuration() / 1000.0));
+                    log.info("----------------------------------------------------------------------------------");
                    break;

                case SURROUNDING_TEXT:
+                    log.info("------------------------------Add surrounding Text--------------------------------");
+                    log.info("Starting surrounding text search for entries {} ", analyzeRequest.getManualRedactions().getEntriesToAdd());
                    result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(),
                            analyzeRequest.getFileId(),
                            analyzeRequest.getManualRedactions());
-                    log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}",
+                    log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {} s",
                            analyzeRequest.getDossierId(),
                            analyzeRequest.getFileId(),
-                            result.getDuration());
+                            format("%.2f", result.getDuration() / 1000.0));
+                    log.info("----------------------------------------------------------------------------------");
                    break;

                default:
                    throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
            }
-
+            log.info("");
            result.setMessageType(analyzeRequest.getMessageType());
            fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);

        } catch (Exception e) {
            log.warn("Failed to process analyze request: {}", analyzeRequest, e);
-            fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+            var timestamp = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+            fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
+                    analyzeRequest.getFileId(),
+                    new FileErrorInfo(e.getMessage(), priority ? REDACTION_PRIORITY_QUEUE : REDACTION_QUEUE, "redaction-service", timestamp));
        }
    }


    @RabbitHandler
    @RabbitListener(queues = REDACTION_DQL)
-    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
+    public void receiveAnalyzeRequestDQL(Message in) throws IOException {

-        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
+        var analyzeRequest = objectMapper.readValue(in.getBody(), AnalyzeRequest.class);
        log.info("Failed to process analyze request: {}", analyzeRequest);
-
-        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        String errorCause = in.getMessageProperties().getHeader(X_ERROR_INFO_HEADER);
+        OffsetDateTime timestamp = in.getMessageProperties().getHeader(X_ERROR_INFO_TIMESTAMP_HEADER);
+        timestamp = timestamp != null ? timestamp : OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
+        log.info("Failed to process analyze request, errorCause: {}, timestamp: {}", errorCause, timestamp);
+        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(),
+                analyzeRequest.getFileId(),
+                new FileErrorInfo(errorCause, REDACTION_DQL, "redaction-service", timestamp));
    }

 }
--- a/Show More
+++ b/Show More