Merge branch 'RED-7759' into 'master'

RED-7759: Cannot resize local manual redactions Closes RED-7759 See merge request redactmanager/redaction-service!173
RED-7759: Cannot resize local manual redactions
2023-10-24 15:12:42 +02:00 · 2023-10-24 15:12:42 +02:00 · 2023-10-24 15:12:16 +02:00 · 2023-10-24 15:12:16 +02:00 · 2023-10-20 15:28:07 +02:00 · 2023-10-20 15:28:07 +02:00
375 changed files with 58770 additions and 50668 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
@@ -26,3 +69,7 @@
 **/.DS_Store
 **/classpath-data.json
 **/dependencies-and-licenses-overview.txt
+gradle.properties
+gradlew
+gradlew.bat
+gradle/
@@ -0,0 +1,23 @@
+variables:
+  SONAR_PROJECT_KEY: 'RED_redaction-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/gradle_java.yml'
+
+deploy:
+  stage: deploy
+  tags:
+    - dind
+  script:
+    - echo "Building with gradle version ${BUILDVERSION}"
+    - gradle -Pversion=${BUILDVERSION} publish
+    - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_TAG
@@ -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,56 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    pmd
+    checkstyle
+    jacoco
+}
+
+group = "com.iqser.red.service"
+
+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"))
+    }
+}
+
+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>
@@ -0,0 +1,15 @@
+#!/bin/bash
+dir=${PWD##*/}
+gradle assemble
+
+# Get the current Git branch
+branch=$(git rev-parse --abbrev-ref HEAD)
+
+# Get the short commit hash (first 5 characters)
+commit_hash=$(git rev-parse --short=5 HEAD)
+
+# Combine branch and commit hash
+buildName="${USER}-${branch}-${commit_hash}"
+
+gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
+echo "nexus.knecon.com:5001/red/${dir}-server-v1:$buildName"
@@ -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,28 @@
+plugins {
+    id("com.iqser.red.service.java-conventions")
+    id("io.freefair.lombok") version "8.4"
+}
+
+description = "redaction-service-api-v1"
+
+dependencies {
+    implementation("org.springframework:spring-web:6.0.12")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.207.0")
+}
+
+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();
+            }
+        }
+    }
+}
@@ -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,20 @@
+package com.iqser.red.service.redaction.v1.model;
+
+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 DroolsSyntaxErrorMessage {
+
+    Integer line;
+    Integer column;
+    String message;
+}
@@ -0,0 +1,34 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DroolsSyntaxValidation {
+
+    @Builder.Default
+    List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = new LinkedList<>();
+
+
+    public void addErrorMessage(int line, int column, String message) {
+
+        getDroolsSyntaxErrorMessages().add(DroolsSyntaxErrorMessage.builder().line(line).column(column).message(message).build());
+    }
+
+    public boolean isCompiled() {
+
+        return droolsSyntaxErrorMessages.isEmpty();
+    }
+
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class RuleValidationModel {
+
+    String ruleFileType;
+    String rulesString;
+
+}
@@ -4,9 +4,12 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
+
 public interface RedactionResource {

    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void testRules(@RequestBody String rules);
+    DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel);

 }
@@ -0,0 +1,95 @@
+import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
+
+plugins {
+    application
+    id("com.iqser.red.service.java-conventions")
+    id("org.springframework.boot") version "3.1.4"
+    id("io.spring.dependency-management") version "1.1.3"
+    id("org.sonarqube") version "4.4.1.3373"
+    id("io.freefair.lombok") version "8.4"
+}
+
+description = "redaction-service-server-v1"
+
+
+val layoutParserVersion = "0.74.0"
+val jacksonVersion = "2.15.2"
+val droolsVersion = "9.44.0.Final"
+val pdfBoxVersion = "3.0.0"
+val persistenceServiceVersion = "2.210.0"
+
+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:${persistenceServiceVersion}") { exclude(group = "org.springframework.boot") }
+    implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
+
+    implementation("com.iqser.red.commons:spring-commons:6.2.0")
+    implementation("com.iqser.red.commons:metric-commons:2.3.0")
+
+    implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0")
+    implementation("com.iqser.red.commons:storage-commons:2.45.0")
+    implementation("com.knecon.fforesight:tenant-commons:0.14.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.74.1.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.1.4")
+
+    testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
+    testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.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") {
+
+    environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
+    environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
+
+    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,16 @@ 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 +38,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,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.settings;
+package com.iqser.red.service.redaction.v1.server;

 import org.springframework.boot.context.properties.ConfigurationProperties;

@@ -24,4 +24,10 @@ public class RedactionServiceSettings {

    private boolean priorityMode;

+    private long dictionaryCacheMaximumSize = 100;
+
+    private int dictionaryCacheExpireAfterAccessDays = 3;
+
+    private int droolsExecutionTimeoutSecs = 300;
+
 }
@@ -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,8 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.commons.spring.ErrorMessage;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;

 import lombok.extern.slf4j.Slf4j;

@@ -3,9 +3,11 @@ package com.iqser.red.service.redaction.v1.server.controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

+import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
+import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.service.drools.DroolsSyntaxValidationService;
+import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;

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

-    private final DroolsExecutionService droolsExecutionService;
+    private final DroolsSyntaxValidationService droolsSyntaxValidationService;


    @Override
-    public void testRules(@RequestBody String rules) {
+    public DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel) {

        try {
-            droolsExecutionService.testRules(rules);
+            return droolsSyntaxValidationService.testRules(rulesValidationModel);
        } catch (Exception e) {
            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
        }
@@ -1,24 +1,28 @@
 package com.iqser.red.service.redaction.v1.server.controller;

+import java.util.Collections;
+
+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 lombok.RequiredArgsConstructor;

-import org.springframework.web.bind.annotation.RestController;
-
@RestController
@RequiredArgsConstructor
 public class RuleBuilderController implements RuleBuilderResource {

-    private final RuleBuilderModelService ruleBuilderModelService;
-

    @Override
    public RuleBuilderModel getRuleBuilderModel() {

-        return ruleBuilderModelService.getRuleBuilderModel();
+        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
+
+        ruleBuilderModel.setWhenClauses(Collections.emptyList());
+        ruleBuilderModel.setThenConditions(Collections.emptyList());
+
+        return ruleBuilderModel;
    }

 }
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import org.kie.api.runtime.KieContainer;
+
+public record KieWrapper(KieContainer container, long rulesVersion) {
+
+    public static KieWrapper empty() {
+
+        return new KieWrapper(null, -1);
+    }
+
+
+    public boolean isPresent() {
+
+        return container != null && rulesVersion >= 0;
+    }
+}
@@ -0,0 +1,116 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import java.util.List;
+import java.util.PriorityQueue;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ManualEntity implements IEntity {
+
+    // The id must be mapped into a TextEntity as is for comments to work correctly
+    String id;
+    String value;
+    List<RectangleWithPage> entityPosition;
+    String ruleIdentifier;
+    String reason;
+    String legalBasis;
+    String type;
+    String section;
+    EntityType entityType;
+    boolean applied;
+    boolean isDictionaryEntry;
+    boolean isDossierDictionaryEntry;
+    boolean rectangle;
+
+    @Builder.Default
+    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+    @Builder.Default
+    ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
+
+
+    public static ManualEntity fromRedactionLogEntry(RedactionLogEntry redactionLogEntry) {
+
+        String ruleIdentifier = redactionLogEntry.getType() + "." + redactionLogEntry.getMatchedRule() + ".0";
+        List<RectangleWithPage> rectangleWithPages = redactionLogEntry.getPositions().stream().map(RectangleWithPage::fromRedactionLogRectangle).toList();
+        return ManualEntity.builder()
+                .id(redactionLogEntry.getId())
+                .value(redactionLogEntry.getValue())
+                .entityPosition(rectangleWithPages)
+                .ruleIdentifier(ruleIdentifier)
+                .reason(redactionLogEntry.getReason())
+                .legalBasis(redactionLogEntry.getLegalBasis())
+                .type(redactionLogEntry.getType())
+                .section(redactionLogEntry.getSection()).entityType(getEntityType(redactionLogEntry))
+                .applied(redactionLogEntry.isRedacted())
+                .isDictionaryEntry(redactionLogEntry.isDictionaryEntry())
+                .isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry())
+                .rectangle(redactionLogEntry.isRectangle())
+                .build();
+    }
+
+
+    private static EntityType getEntityType(RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.isRecommendation()) {
+            return EntityType.RECOMMENDATION;
+        }
+        if (redactionLogEntry.isHint()) {
+            return EntityType.HINT;
+        }
+        return EntityType.ENTITY;
+    }
+
+
+    public static ManualEntity fromManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, boolean hint) {
+
+        List<RectangleWithPage> rectangleWithPages = manualRedactionEntry.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
+        ManualChangeOverwrite manualChangeOverwrite = new ManualChangeOverwrite();
+        manualChangeOverwrite.addChange(manualRedactionEntry);
+        return ManualEntity.builder()
+                .id(manualRedactionEntry.getAnnotationId())
+                .value(manualRedactionEntry.getValue())
+                .entityPosition(rectangleWithPages)
+                .ruleIdentifier("MAN.0.0")
+                .reason(manualRedactionEntry.getReason())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .type(manualRedactionEntry.getType())
+                .section(manualRedactionEntry.getSection()).entityType(hint ? EntityType.HINT : EntityType.ENTITY)
+                .applied(true)
+                .isDictionaryEntry(false)
+                .isDossierDictionaryEntry(false)
+                .rectangle(manualRedactionEntry.isRectangle())
+                .manualOverwrite(manualChangeOverwrite)
+                .build();
+    }
+
+
+    @Override
+    public TextRange getTextRange() {
+
+        return new TextRange(-1, -1);
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(type);
+    }
+
+}
@@ -0,0 +1,44 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class NerEntities {
+
+    List<NerEntity> nerEntityList;
+
+
+    public NerEntities() {
+
+        nerEntityList = new LinkedList<>();
+    }
+
+
+    public boolean hasEntitiesOfType(String type) {
+
+        return nerEntityList.stream().anyMatch(nerEntity -> nerEntity.type.equals(type));
+    }
+
+
+    public Stream<NerEntity> streamEntitiesOfType(String type) {
+
+        return nerEntityList.stream().filter(nerEntity -> nerEntity.type().equals(type));
+    }
+
+
+    public record NerEntity(String value, TextRange textRange, String type) {
+
+    }
+
+}
@@ -0,0 +1,32 @@
+package com.iqser.red.service.redaction.v1.server.model;
+
+import java.awt.geom.Rectangle2D;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+
+public record RectangleWithPage(int pageNumber, Rectangle2D rectangle2D) {
+
+    public static RectangleWithPage fromRedactionLogRectangle(Rectangle rectangle) {
+
+        return new RectangleWithPage(rectangle.getPage(), toRectangle2D(rectangle));
+    }
+
+
+    public static RectangleWithPage fromAnnotationRectangle(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rectangle) {
+
+        return new RectangleWithPage(rectangle.getPage(), toRectangle2D(rectangle));
+    }
+
+
+    private static Rectangle2D toRectangle2D(Rectangle rectangle) {
+
+        return new Rectangle2D.Float(rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getWidth(), rectangle.getHeight());
+    }
+
+
+    private static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rectangle) {
+
+        return new Rectangle2D.Float(rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getWidth(), rectangle.getHeight());
+    }
+
+}
@@ -0,0 +1,41 @@
+package com.iqser.red.service.redaction.v1.server.model.component;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+
+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 Component {
+
+    RuleIdentifier matchedRule;
+    String name;
+    String value;
+    String valueDescription;
+
+    List<Entity> references;
+
+
+    public boolean addReference(Entity entity) {
+
+        return references.add(entity);
+    }
+
+
+    public boolean addReferences(Collection<Entity> entities) {
+
+        return references.addAll(entities);
+    }
+
+}
@@ -0,0 +1,101 @@
+package com.iqser.red.service.redaction.v1.server.model.component;
+
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class Entity {
+
+    String id;
+    String type;
+    EntryType entryType;
+    EntryState state;
+    String value;
+    String reason;
+    String matchedRule;
+    String legalBasis;
+
+    boolean imported;
+
+    SemanticNode containingNode;
+    String section;
+    float[] color;
+
+    List<Position> positions;
+
+    String textBefore;
+    String textAfter;
+
+    int startOffset;
+    int endOffset;
+    int length;
+
+    boolean imageHasTransparency;
+
+    boolean isDictionaryEntry;
+    boolean isDossierDictionaryEntry;
+
+    boolean excluded;
+
+    List<Change> changes;
+
+    List<ManualChange> manualChanges;
+
+    Set<Engine> engines;
+
+    Set<String> reference;
+
+    Set<String> importedRedactionIntersections;
+
+
+    public static Entity fromEntityLogEntry(EntityLogEntry e, Document document) {
+
+        return Entity.builder()
+                .id(e.getId())
+                .type(e.getType())
+                .entryType(e.getEntryType())
+                .state(e.getState())
+                .value(e.getValue())
+                .reason(e.getReason())
+                .matchedRule(e.getMatchedRule())
+                .legalBasis(e.getLegalBasis())
+                .imported(e.isImported())
+                .section(e.getSection())
+                .color(e.getColor()).positions(e.getPositions()).containingNode(document.getDocumentTree().getEntryById(e.getContainingNodeId()).getNode())
+                .textBefore(e.getTextBefore())
+                .textAfter(e.getTextAfter())
+                .startOffset(e.getStartOffset())
+                .endOffset(e.getEndOffset())
+                .length(e.getValue().length())
+                .imageHasTransparency(e.isImageHasTransparency())
+                .isDictionaryEntry(e.isDictionaryEntry())
+                .isDossierDictionaryEntry(e.isDossierDictionaryEntry())
+                .excluded(e.isExcluded())
+                .changes(e.getChanges())
+                .manualChanges(e.getManualChanges())
+                .engines(e.getEngines())
+                .reference(e.getReference())
+                .importedRedactionIntersections(e.getImportedRedactionIntersections())
+                .build();
+    }
+
+}
@@ -0,0 +1,145 @@
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
+
+import static java.lang.String.format;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.utils.Patterns;
+
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+public class Dictionary {
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+    @Getter
+    private DictionaryVersion version;
+
+
+    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
+
+        this.dictionaryModels = dictionaryModels;
+        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
+        this.version = version;
+    }
+
+
+    public int getDictionaryRank(String type) {
+
+        if (!localAccessMap.containsKey(type)) {
+            return 0;
+        }
+        return localAccessMap.get(type).getRank();
+    }
+
+
+    public boolean hasLocalEntries() {
+
+        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntriesWithMatchedRules().isEmpty());
+    }
+
+
+    public Set<String> getTypes() {
+
+        return localAccessMap.keySet();
+    }
+
+
+    public DictionaryModel getType(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model == null) {
+            throw new NotFoundException("Type: " + type + " is not found");
+        }
+        return model;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+
+    private void addLocalDictionaryEntry(String type, String value, Collection<MatchedRule> matchedRules, boolean alsoAddLastname) {
+
+        if (value.isBlank()) {
+            return;
+        }
+        if (localAccessMap.get(type) == null) {
+            throw new IllegalArgumentException(format("DictionaryModel of type %s does not exist", type));
+        }
+        if (localAccessMap.get(type).getLocalEntriesWithMatchedRules() == null) {
+            throw new IllegalArgumentException(format("DictionaryModel of type %s has no local Entries", type));
+        }
+        if (StringUtils.isEmpty(value)) {
+            throw new IllegalArgumentException(format("%s is not a valid dictionary entry", value));
+        }
+        Set<MatchedRule> matchedRulesSet = new HashSet<>(matchedRules);
+        localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(value.trim(), matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
+        if (alsoAddLastname) {
+            String lastname = value.split(" ")[0];
+            localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(lastname, matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
+        }
+    }
+
+
+    public void recommendEverywhere(TextEntity textEntity) {
+
+        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), false);
+    }
+
+
+    public void recommendEverywhereWithLastNameSeparately(TextEntity textEntity) {
+
+        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), true);
+    }
+
+
+    public void addMultipleAuthorsAsRecommendation(TextEntity textEntity) {
+
+        String cleanedWord = textEntity.getValue().replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
+        Pattern pattern = Patterns.AUTHOR_TABLE_SPLITTER;
+        Matcher matcher = pattern.matcher(cleanedWord);
+
+        while (matcher.find()) {
+            String match = matcher.group().trim();
+            if (match.length() >= 3) {
+                addLocalDictionaryEntry(textEntity.getType(), match, textEntity.getMatchedRuleList(), true);
+            }
+        }
+    }
+
+}
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictionaryEntries {
+
+    @Builder.Default
+    Set<DictionaryEntryModel> entries = new HashSet<>();
+    @Builder.Default
+    Set<DictionaryEntryModel> falsePositives = new HashSet<>();
+    @Builder.Default
+    Set<DictionaryEntryModel> falseRecommendations = new HashSet<>();
+
+}
@@ -1,10 +1,10 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
+
+import java.util.Set;

 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.Set;
-
@Data
@AllArgsConstructor
 public class DictionaryIncrement {
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,16 +1,17 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;

-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.dictionarymerge.commons.DictionaryEntry;
+import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;

 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {
@@ -21,16 +22,16 @@ public class DictionaryModel implements Serializable {
    private final boolean caseInsensitive;
    private final boolean hint;
    private final boolean isDossierDictionary;
-    private final Set<DictionaryEntry> entries;
-    private final Set<DictionaryEntry> falsePositives;
-    private final Set<DictionaryEntry> falseRecommendations;
+    private final Set<DictionaryEntryModel> entries;
+    private final Set<DictionaryEntryModel> falsePositives;
+    private final Set<DictionaryEntryModel> falseRecommendations;

    private transient SearchImplementation entriesSearch;
    private transient SearchImplementation falsePositiveSearch;
    private transient SearchImplementation falseRecommendationsSearch;
-    private transient SearchImplementation localSearch;

-    private final Set<String> localEntries = new HashSet<>();
+    private final HashMap<String, Set<MatchedRule>> localEntriesWithMatchedRules = new HashMap<>();
+    private transient SearchImplementation localSearch;


    public DictionaryModel(String type,
@@ -38,9 +39,9 @@ public class DictionaryModel implements Serializable {
                           float[] color,
                           boolean caseInsensitive,
                           boolean hint,
-                           Set<DictionaryEntry> entries,
-                           Set<DictionaryEntry> falsePositives,
-                           Set<DictionaryEntry> falseRecommendations,
+                           Set<DictionaryEntryModel> entries,
+                           Set<DictionaryEntryModel> falsePositives,
+                           Set<DictionaryEntryModel> falseRecommendations,
                           boolean isDossierDictionary) {

        this.type = type;
@@ -54,9 +55,9 @@ public class DictionaryModel implements Serializable {
        this.falsePositives = falsePositives;
        this.falseRecommendations = falseRecommendations;

-        this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
+        this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntryModel::getValue).collect(Collectors.toList()),
                caseInsensitive);
-        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
+        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntryModel::getValue).collect(Collectors.toList()),
                caseInsensitive);
        this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream()
                .filter(e -> !e.isDeleted())
@@ -68,8 +69,8 @@ public class DictionaryModel implements Serializable {

    public SearchImplementation getLocalSearch() {

-        if (this.localSearch == null) {
-            this.localSearch = new SearchImplementation(this.localEntries, caseInsensitive);
+        if (this.localSearch == null || this.localSearch.getValues().size() != this.localEntriesWithMatchedRules.size()) {
+            this.localSearch = new SearchImplementation(this.localEntriesWithMatchedRules.keySet(), caseInsensitive);
        }
        return this.localSearch;
    }
@@ -1,12 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import lombok.Data;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;

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

+import lombok.Data;
+
@Data
 public class DictionaryRepresentation {

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -1,9 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import org.ahocorasick.trie.Trie;
+package com.iqser.red.service.redaction.v1.server.model.dictionary;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -12,6 +7,12 @@ import java.util.Locale;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

+import org.ahocorasick.trie.Trie;
+
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+
+import lombok.Data;
+
@Data
 public class SearchImplementation {

@@ -46,7 +47,12 @@ public class SearchImplementation {

        if (this.values.size() == 1) {
            var text = this.values.iterator().next();
-            this.pattern = Pattern.compile(Pattern.quote(ignoreCase ? text.toLowerCase(Locale.ROOT) : text));
+
+            if (this.ignoreCase) {
+                this.pattern = Pattern.compile(Pattern.quote(text.toLowerCase(Locale.ROOT)), Pattern.CASE_INSENSITIVE);
+            } else {
+                this.pattern = Pattern.compile(Pattern.quote(text));
+            }
        } else {
            var builder = Trie.builder();
            if (this.ignoreCase) {
@@ -74,7 +80,33 @@ public class SearchImplementation {
        } else {
            return this.trie.containsMatch(textToCheck);
        }
+    }

+
+    public List<TextRange> getBoundaries(CharSequence text) {
+
+        if (this.values.isEmpty()) {
+            return new ArrayList<>();
+        }
+        if (this.pattern != null) {
+            return this.pattern.matcher(text).results().map(r -> new TextRange(r.start(), r.end())).collect(Collectors.toList());
+        } else {
+            return this.trie.parseText(text).stream().map(r -> new TextRange(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
+        }
+    }
+
+
+    public List<TextRange> getBoundaries(CharSequence text, TextRange region) {
+
+        if (this.values.isEmpty()) {
+            return new ArrayList<>();
+        }
+        CharSequence subSequence = text.subSequence(region.start(), region.end());
+        if (this.pattern != null) {
+            return this.pattern.matcher(subSequence).results().map(r -> new TextRange(r.start() + region.start(), r.end() + region.start())).collect(Collectors.toList());
+        } else {
+            return this.trie.parseText(subSequence).stream().map(r -> new TextRange(r.getStart() + region.start(), r.getEnd() + region.start() + 1)).collect(Collectors.toList());
+        }
    }


@@ -95,12 +127,7 @@ public class SearchImplementation {
    }


-    @Data
-    @AllArgsConstructor
-    public static class MatchPosition {
-
-        private int startIndex;
-        private int endIndex;
+    public record MatchPosition(int startIndex, int endIndex) {

    }

@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.model.dictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class TenantDictionary {
+
+    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
+
+}
@@ -0,0 +1,70 @@
+package com.iqser.red.service.redaction.v1.server.model.document;
+
+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<TextRange, List<TextRange>, List<TextRange>> {
+
+    @Override
+    public Supplier<List<TextRange>> supplier() {
+
+        return LinkedList::new;
+    }
+
+
+    @Override
+    public BiConsumer<List<TextRange>, TextRange> accumulator() {
+
+        return (existingList, boundary) -> {
+            if (existingList.isEmpty()) {
+                existingList.add(boundary);
+                return;
+            }
+
+            TextRange prevTextRange = existingList.get(existingList.size() - 1);
+            if (prevTextRange.end() > boundary.start()) {
+                throw new IllegalArgumentException(String.format("Can't concatenate %s and %s. Boundaries must be ordered!", prevTextRange, boundary));
+            }
+
+            if (prevTextRange.end() == boundary.start()) {
+                existingList.remove(existingList.size() - 1);
+                existingList.add(TextRange.merge(List.of(prevTextRange, boundary)));
+            } else {
+                existingList.add(boundary);
+            }
+        };
+    }
+
+
+    @Override
+    public BinaryOperator<List<TextRange>> combiner() {
+
+        return (list1, list2) -> {
+            list1.addAll(list2);
+            return list1;
+        };
+    }
+
+
+    @Override
+    public Function<List<TextRange>, List<TextRange>> finisher() {
+
+        return Functions.identity();
+    }
+
+
+    @Override
+    public Set<Characteristics> characteristics() {
+
+        return Set.of(Characteristics.IDENTITY_FINISH);
+    }
+
+}
@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.server.model.document;
+
+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,260 @@
+package com.iqser.red.service.redaction.v1.server.model.document;
+
+import static java.lang.String.format;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.GenericSemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.NodeType;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Table;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.TableCell;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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 Optional<SemanticNode> getNextSibling(List<Integer> treeId) {
+
+        var siblingTreeId = getNextSiblingId(treeId);
+        if (!entryExists(siblingTreeId)) {
+            return Optional.empty();
+        }
+        return Optional.of(getEntryById(siblingTreeId).getNode());
+    }
+
+
+    public List<Integer> getNextSiblingId(List<Integer> treeId) {
+
+        List<Integer> siblingTreeId = new LinkedList<>();
+        for (int i = 0; i < treeId.size() - 1; i++) {
+            siblingTreeId.add(treeId.get(i));
+        }
+        siblingTreeId.add(treeId.get(treeId.size() - 1) + 1);
+        return siblingTreeId;
+    }
+
+
+    public Optional<SemanticNode> getPreviousSibling(List<Integer> treeId) {
+
+        var siblingTreeId = getPreviousSiblingId(treeId);
+        if (!entryExists(siblingTreeId)) {
+            return Optional.empty();
+        }
+        return Optional.of(getEntryById(siblingTreeId).getNode());
+    }
+
+
+    public List<Integer> getPreviousSiblingId(List<Integer> treeId) {
+
+        List<Integer> siblingTreeId = new LinkedList<>();
+        for (int i = 0; i < treeId.size() - 1; i++) {
+            siblingTreeId.add(treeId.get(i));
+        }
+        siblingTreeId.add(treeId.get(treeId.size() - 1) - 1);
+        return siblingTreeId;
+    }
+
+
+    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();
+        }
+
+    }
+
+}
@@ -0,0 +1,166 @@
+package com.iqser.red.service.redaction.v1.server.model.document;
+
+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.model.document.textblock.TextBlock;
+
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+
+@Setter
+@EqualsAndHashCode
+public class TextRange implements Comparable<TextRange> {
+
+    private int start;
+    private int end;
+
+
+    public TextRange(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(TextRange textRange) {
+
+        return start <= textRange.start() && textRange.end() <= end;
+    }
+
+
+    public boolean containedBy(TextRange textRange) {
+
+        return textRange.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(TextRange textRange) {
+
+        return textRange.start() < this.end && this.start < textRange.end();
+    }
+
+
+    public List<TextRange> 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<TextRange> 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 TextRange(previousIndex, splitIndex));
+            previousIndex = splitIndex;
+        }
+        splitBoundaries.add(new TextRange(previousIndex, end));
+        return splitBoundaries;
+    }
+
+
+    public static TextRange merge(Collection<TextRange> boundaries) {
+
+        int minStart = boundaries.stream().mapToInt(TextRange::start).min().orElseThrow(IllegalArgumentException::new);
+        int maxEnd = boundaries.stream().mapToInt(TextRange::end).max().orElseThrow(IllegalArgumentException::new);
+        return new TextRange(minStart, maxEnd);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return format("Boundary [%d|%d)", start, end);
+    }
+
+
+    @Override
+    public int compareTo(TextRange textRange) {
+
+        if (end < textRange.end() && start < textRange.start()) {
+            return -1;
+        }
+        if (start > textRange.start() && end > textRange.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 TextRange 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 TextRange(trimmedStart, Math.max(trimmedEnd, trimmedStart));
+    }
+
+}
@@ -1,7 +1,8 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
+package com.iqser.red.service.redaction.v1.server.model.document.entity;

 public enum EntityType {
    ENTITY,
+    HINT,
    RECOMMENDATION,
    FALSE_POSITIVE,
    FALSE_RECOMMENDATION
@@ -0,0 +1,213 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.PriorityQueue;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+
+import lombok.NonNull;
+
+public interface IEntity {
+
+    PriorityQueue<MatchedRule> getMatchedRuleList();
+
+
+    ManualChangeOverwrite getManualOverwrite();
+
+
+    String getValue();
+
+
+    TextRange getTextRange();
+
+
+    String type();
+
+
+    default int length() {
+
+        return value().length();
+    }
+
+
+    default String value() {
+
+        return getManualOverwrite().getValue().orElse(getValue() == null ? "" : getValue());
+    }
+
+
+    // Don't use default accessor pattern (e.g. isApplied()), as it might lead to errors in drools due to property-specific optimization of the drools planner.
+    default boolean applied() {
+
+        return getManualOverwrite().getApplied().orElse(getMatchedRule().isApplied());
+    }
+
+
+    default boolean skipped() {
+
+        return !applied();
+    }
+
+
+    default boolean ignored() {
+
+        return getManualOverwrite().getIgnored().orElse(getMatchedRule().isIgnored());
+    }
+
+
+    default boolean removed() {
+
+        return getManualOverwrite().getRemoved().orElse(getMatchedRule().isRemoved());
+    }
+
+
+    default boolean resized() {
+
+        return getManualOverwrite().getResized().orElse(false);
+    }
+
+
+    default boolean active() {
+
+        return !(removed() || ignored());
+    }
+
+
+    default boolean hasManualChanges() {
+
+        return !getManualOverwrite().getManualChangeLog().isEmpty();
+    }
+
+
+    default Set<TextEntity> references() {
+
+        return getMatchedRule().getReferences();
+    }
+
+
+    default void redact(@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");
+        }
+        apply(ruleIdentifier, reason, legalBasis);
+    }
+
+
+    default void apply(@NonNull String ruleIdentifier, String reason, String legalBasis) {
+
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).legalBasis(legalBasis).applied(true).build());
+    }
+
+
+    default void apply(@NonNull String ruleIdentifier, String reason) {
+
+        apply(ruleIdentifier, reason, "n-a");
+    }
+
+
+    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).removed(true).build());
+    }
+
+
+    default void ignore(String ruleIdentifier, String reason) {
+
+        addMatchedRule(MatchedRule.builder().ruleIdentifier(RuleIdentifier.fromString(ruleIdentifier)).reason(reason).ignored(true).build());
+    }
+
+
+    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<TextEntity> 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<TextEntity> 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) {
+
+        if (getMatchedRuleList().equals(matchedRules)) {
+            return;
+        }
+        getMatchedRuleList().addAll(matchedRules);
+    }
+
+
+    default int getMatchedRuleUnit() {
+
+        return getMatchedRule().getRuleIdentifier().unit();
+    }
+
+
+    default MatchedRule getMatchedRule() {
+
+        if (getMatchedRuleList().isEmpty()) {
+            return MatchedRule.empty();
+        }
+        return getMatchedRuleList().peek();
+    }
+
+
+    default String buildReasonWithManualChangeDescriptions() {
+
+        if (getManualOverwrite().getDescriptions().isEmpty()) {
+            return getMatchedRule().getReason();
+        }
+        if (getMatchedRule().getReason().isEmpty()) {
+            return String.join(", ", getManualOverwrite().getDescriptions());
+        }
+        return getMatchedRule().getReason() + ", " + String.join(", ", getManualOverwrite().getDescriptions());
+    }
+
+
+    default String legalBasis() {
+
+        return getManualOverwrite().getLegalBasis().orElse(getMatchedRule().getLegalBasis());
+    }
+
+}
@@ -0,0 +1,219 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.BaseAnnotation;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.server.model.RectangleWithPage;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ManualChangeOverwrite {
+
+    private static final Map<Class<? extends BaseAnnotation>, String> MANUAL_CHANGE_DESCRIPTIONS = Map.of(//
+            ManualRedactionEntry.class, "created by manual change", //
+            ManualLegalBasisChange.class, "legal basis was manually changed", //
+            ManualResizeRedaction.class, "resized by manual override", //
+            ManualForceRedaction.class, "forced by manual override", //
+            IdRemoval.class, "removed by manual override", //
+            ManualRecategorization.class, "recategorized by manual override");
+
+    List<BaseAnnotation> manualChanges = new LinkedList<>();
+    boolean changed;
+    List<String> descriptions;
+    String type;
+    String legalBasis;
+    String section;
+    String value;
+    List<RectangleWithPage> positions;
+    Boolean applied;
+    Boolean removed;
+    Boolean ignored;
+    Boolean resized;
+    Boolean recategorized;
+
+
+    public void calculateCurrentOverride() {
+
+        if (!changed) {
+            return;
+        }
+        List<BaseAnnotation> sortedManualChanges = getManualChangeLog();
+        updateFields(sortedManualChanges);
+    }
+
+
+    public List<BaseAnnotation> getManualChangeLog() {
+
+        if (!changed) {
+            return manualChanges;
+        }
+        manualChanges.sort(Comparator.comparing(BaseAnnotation::getRequestDate));
+        updateFields(manualChanges);
+        // make list unmodifiable.
+        return manualChanges.stream().toList();
+    }
+
+
+    private void updateFields(List<BaseAnnotation> sortedManualChanges) {
+
+        descriptions = new LinkedList<>();
+
+        for (BaseAnnotation manualChange : sortedManualChanges) {
+            // ManualRedactionEntries are created prior to rule execution in analysis service.
+
+            if (manualChange instanceof IdRemoval) {
+                applied = false;
+                ignored = true;
+            }
+
+            if (manualChange instanceof ManualForceRedaction manualForceRedaction) {
+                removed = false;
+                ignored = false;
+                applied = true;
+                legalBasis = manualForceRedaction.getLegalBasis();
+            }
+
+            if (manualChange instanceof ManualLegalBasisChange manualLegalBasisChange) {
+                section = manualLegalBasisChange.getSection();
+                legalBasis = manualLegalBasisChange.getLegalBasis();
+                value = manualLegalBasisChange.getValue();
+            }
+
+            if (manualChange instanceof ManualResizeRedaction manualResizeRedaction) {
+                // resizing logic for TextEntities and Images happens in ManualChangesApplicationService.
+                resized = true;
+                // This is only for not found Manual Entities.
+                value = manualResizeRedaction.getValue();
+                positions = manualResizeRedaction.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
+            }
+
+            if (manualChange instanceof ManualRecategorization recategorization) {
+                // recategorization logic happens in ManualChangesApplicationService.
+                recategorized = true;
+                // this is only relevant for ManualEntities. Image and TextEntity is recategorized in the ManualChangesApplicationService.
+                type = recategorization.getType();
+            }
+
+            descriptions.add(MANUAL_CHANGE_DESCRIPTIONS.get(manualChange.getClass()));
+        }
+        changed = false;
+    }
+
+
+    public void addChange(BaseAnnotation manualChange) {
+
+        changed = true;
+        manualChanges.add(manualChange);
+    }
+
+
+    public void addChanges(List<BaseAnnotation> manualChangeLog) {
+
+        changed = true;
+        manualChanges.addAll(manualChangeLog);
+    }
+
+
+    public Optional<String> getLegalBasis() {
+
+        calculateCurrentOverride();
+        return legalBasis == null ? Optional.empty() : Optional.of(legalBasis);
+    }
+
+
+    public Optional<String> getType() {
+
+        calculateCurrentOverride();
+        return type == null ? Optional.empty() : Optional.of(type);
+    }
+
+
+    public Optional<String> getSection() {
+
+        calculateCurrentOverride();
+        return section == null ? Optional.empty() : Optional.of(section);
+    }
+
+
+    public Optional<String> getValue() {
+
+        calculateCurrentOverride();
+        return value == null ? Optional.empty() : Optional.of(value);
+    }
+
+
+    public Optional<Boolean> getApplied() {
+
+        calculateCurrentOverride();
+        return applied == null ? Optional.empty() : Optional.of(applied);
+    }
+
+
+    public Optional<Boolean> getRemoved() {
+
+        calculateCurrentOverride();
+        return removed == null ? Optional.empty() : Optional.of(removed);
+    }
+
+
+    public Optional<Boolean> getIgnored() {
+
+        calculateCurrentOverride();
+        return ignored == null ? Optional.empty() : Optional.of(ignored);
+    }
+
+
+    public Optional<Boolean> getResized() {
+
+        calculateCurrentOverride();
+        return resized == null ? Optional.empty() : Optional.of(resized);
+    }
+
+
+    public Optional<Boolean> getRecategorized() {
+
+        calculateCurrentOverride();
+        return recategorized == null ? Optional.empty() : Optional.of(recategorized);
+    }
+
+
+    public List<String> getDescriptions() {
+
+        calculateCurrentOverride();
+        return descriptions == null ? Collections.emptyList() : descriptions;
+    }
+
+
+    public Optional<List<RectangleWithPage>> getPositions() {
+
+        calculateCurrentOverride();
+        return positions == null ? Optional.empty() : Optional.of(positions);
+    }
+
+
+    public static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rect) {
+
+        return new Rectangle2D.Double(rect.getTopLeftX() - rect.getWidth(), rect.getTopLeftY() - rect.getHeight(), rect.getWidth(), rect.getHeight());
+    }
+
+}
@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
+import com.iqser.red.service.redaction.v1.server.model.drools.RuleType;
+
+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> {
+
+    public static final RuleType FINAL_TYPE = RuleType.fromString("FINAL");
+    public static final RuleType ELIMINATION_RULE_TYPE = RuleType.fromString("X");
+    private static final List<RuleType> RULE_TYPE_PRIORITIES = List.of(FINAL_TYPE, ELIMINATION_RULE_TYPE);
+
+    RuleIdentifier ruleIdentifier;
+    @Builder.Default
+    String reason = "";
+    @Builder.Default
+    String legalBasis = "";
+    boolean applied;
+    boolean writeValueWithLineBreaks;
+    boolean removed;
+    boolean ignored;
+    boolean resized;
+    @Builder.Default
+    Set<TextEntity> references = Collections.emptySet();
+
+
+    public static MatchedRule empty() {
+
+        return MatchedRule.builder().ruleIdentifier(RuleIdentifier.empty()).build();
+    }
+
+
+    @Override
+    public int compareTo(MatchedRule matchedRule) {
+
+        // Only the highest ranked rule is actually applied, this method defines the highest order.
+        // First, it compares the Rule Type, RULE_TYPE_PRIORITIES defines the order of types.
+        // Types not in the list have the lowest priority.
+        // The ones in the list are technical exceptions and should override any other Rule.
+        // Aside from them Entities should never match from more than one type!
+        // E.g. a CBI_author entity should **always** only match CBI.*.* rules.
+        // Otherwise, something went wrong with the rules. :)
+        RuleIdentifier otherRuleIdentifier = matchedRule.getRuleIdentifier();
+        boolean thisInList = RULE_TYPE_PRIORITIES.contains(this.getRuleIdentifier().type());
+        boolean otherInList = RULE_TYPE_PRIORITIES.contains(otherRuleIdentifier.type());
+
+        // Compare the types
+        if (thisInList && !otherInList) {
+            return -1;
+        } else if (!thisInList && otherInList) {
+            return 1;
+        } else if (thisInList && otherInList) {
+            int thisIndex = RULE_TYPE_PRIORITIES.indexOf(this.getRuleIdentifier().type());
+            int otherIndex = RULE_TYPE_PRIORITIES.indexOf(otherRuleIdentifier.type());
+            return Integer.compare(thisIndex, otherIndex);
+        }
+        // Then compare the unit
+        if (!Objects.equals(otherRuleIdentifier.unit(), getRuleIdentifier().unit())) {
+            return Integer.compare(otherRuleIdentifier.unit(), ruleIdentifier.unit());
+        }
+        // Then compare the id inside the unit
+        return Integer.compare(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,25 @@
+package com.iqser.red.service.redaction.v1.server.model.document.entity;
+
+import java.awt.geom.Rectangle2D;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PositionOnPage {
+
+    // Each entry in this list corresponds to an entry in the redaction log, this means:
+    // A single entity might be represented by multiple redaction log entries
+    // This is due to the RedactionLog only being able to handle a single page per entry.
+    final String id;
+    Page page;
+    List<Rectangle2D> rectanglePerLine;
+
+}
@@ -0,0 +1,210 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.analysislog.entitylog.Engine;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.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 TextEntity implements IEntity {
+
+    // primary key
+    @EqualsAndHashCode.Include
+    final TextRange textRange;
+    @EqualsAndHashCode.Include
+    final String type;
+    @EqualsAndHashCode.Include
+    final EntityType entityType;
+    // primary key end
+
+    @Builder.Default
+    final PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+    @Builder.Default
+    final ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
+
+    boolean dictionaryEntry;
+    boolean dossierDictionaryEntry;
+
+    @Builder.Default
+    Set<Engine> engines = new HashSet<>();
+
+    // inferred on graph insertion
+    String value;
+    String textBefore;
+    String textAfter;
+    @Builder.Default
+    Set<Page> pages = new HashSet<>();
+    List<PositionOnPage> positionsOnPagePerPage;
+    @Builder.Default
+    List<SemanticNode> intersectingNodes = new LinkedList<>();
+    SemanticNode deepestFullyContainingNode;
+
+
+    public static TextEntity initialEntityNode(TextRange textRange, String type, EntityType entityType) {
+
+        return TextEntity.builder().type(type).entityType(entityType).textRange(textRange).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(getTextRange());
+    }
+
+
+    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<>();
+        remove("FINAL.0.0", "removed completely");
+    }
+
+
+    public List<PositionOnPage> getPositionsOnPagePerPage() {
+
+        if (positionsOnPagePerPage == null || positionsOnPagePerPage.isEmpty()) {
+            Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = deepestFullyContainingNode.getTextBlock().getPositionsPerPage(textRange);
+
+            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());
+            positionsOnPagePerPage = rectanglesPerLinePerPage.entrySet().stream().map(entry -> buildPositionOnPage(firstPage, id, entry)).toList();
+        }
+        return positionsOnPagePerPage;
+    }
+
+
+    private static PositionOnPage buildPositionOnPage(Page firstPage, String id, Map.Entry<Page, List<Rectangle2D>> entry) {
+
+        if (entry.getKey().equals(firstPage)) {
+            return new PositionOnPage(id, entry.getKey(), entry.getValue());
+        } else {
+            return new PositionOnPage(id + "-" + entry.getKey().getNumber(), entry.getKey(), entry.getValue());
+        }
+    }
+
+
+    public boolean containedBy(TextEntity textEntity) {
+
+        return this.textRange.containedBy(textEntity.getTextRange());
+    }
+
+
+    public boolean contains(TextEntity textEntity) {
+
+        return this.textRange.contains(textEntity.getTextRange());
+    }
+
+
+    public boolean intersects(TextEntity textEntity) {
+
+        return this.textRange.intersects(textEntity.getTextRange());
+    }
+
+
+    public void addEngine(Engine engine) {
+
+        engines.add(engine);
+    }
+
+
+    public void addEngines(Set<Engine> engines) {
+
+        this.engines.addAll(engines);
+    }
+
+
+    public boolean matchesAnnotationId(String manualRedactionId) {
+
+        return getPositionsOnPagePerPage().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(textRange);
+        sb.append(", pages[");
+        pages.forEach(page -> {
+            sb.append(page.getNumber());
+            sb.append(", ");
+        });
+        sb.delete(sb.length() - 2, sb.length());
+        sb.append("], type = \"");
+        sb.append(type);
+        sb.append("\", EntityType.");
+        sb.append(entityType);
+        sb.append("]");
+        return sb.toString();
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(type);
+    }
+
+}
@@ -0,0 +1,127 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.nodes;
+
+public interface GenericSemanticNode extends SemanticNode {
+
+}
@@ -0,0 +1,74 @@
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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,130 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.Locale;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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, IEntity {
+
+    List<Integer> treeId;
+    String id;
+
+    ImageType imageType;
+    boolean transparent;
+    Rectangle2D position;
+
+    @Builder.Default
+    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
+
+    @Builder.Default
+    ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
+
+    @EqualsAndHashCode.Exclude
+    Page page;
+
+    @EqualsAndHashCode.Exclude
+    DocumentTree documentTree;
+
+    @Builder.Default
+    @EqualsAndHashCode.Exclude
+    Set<TextEntity> 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 TextRange getTextRange() {
+
+        return GenericSemanticNode.super.getTextRange();
+    }
+
+
+    @Override
+    public String type() {
+
+        return getManualOverwrite().getType().orElse(imageType.toString());
+    }
+
+
+    @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;
+    }
+
+
+    @Override
+    public String getValue() {
+
+        return NodeType.IMAGE + ":" + camelCase(imageType.toString());
+    }
+
+
+    private String camelCase(String name) {
+
+        return name.charAt(0) + name.substring(1).toLowerCase(Locale.ENGLISH);
+    }
+
+
+    public int length() {
+
+        return 0;
+    }
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.model.document.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.ENGLISH);
+    }
+}
@@ -0,0 +1,75 @@
+package com.iqser.red.service.redaction.v1.server.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.nodes;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.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,614 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.AtomicTextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+import com.iqser.red.service.redaction.v1.server.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 TextRange intersects the TextRange of this node.
+     *
+     * @return Set of all Entities associated with this Node
+     */
+    Set<TextEntity> 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 TextRange, 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(TextRange textRange) {
+
+        if (!getTextRange().contains(textRange)) {
+            throw new IllegalArgumentException(format("%s which was used to query for pages is not contained in the %s of this node!", textRange, getTextRange()));
+        }
+        return getTextBlock().getPages(textRange);
+    }
+
+
+    default boolean onPage(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());
+    }
+
+
+    /**
+     * Returns the next sibling node of this SemanticNode in the document tree, if any.
+     * If there is no next sibling node, an empty Optional is returned.
+     *
+     * @return Optional containing the next sibling node, or empty if there is none
+     */
+    default Optional<SemanticNode> getNextSibling() {
+
+        return getDocumentTree().getNextSibling(getTreeId());
+    }
+
+
+    /**
+     * Returns the previous sibling node of this SemanticNode in the document tree, if any.
+     * If there is no previous sibling node, an empty Optional is returned.
+     *
+     * @return Optional containing the previous sibling node, or empty if there is none
+     */
+    default Optional<SemanticNode> getPreviousSibling() {
+
+        return getDocumentTree().getPreviousSibling(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(TextEntity::active).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 the provided types
+     */
+    default boolean hasEntitiesOfAnyType(String... types) {
+
+        return getEntities().stream().filter(TextEntity::active).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(TextEntity::active)
+                .map(TextEntity::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<TextEntity> getEntitiesOfType(String type) {
+
+        return getEntities().stream().filter(TextEntity::active).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<TextEntity> getEntitiesOfType(List<String> types) {
+
+        return getEntities().stream().filter(TextEntity::active).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<TextEntity> getEntitiesOfType(String... types) {
+
+        return getEntities().stream().filter(TextEntity::active).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);
+    }
+
+
+    /**
+     * Checks whether this SemanticNode intersects the provided rectangle.
+     * @param x the lower left corner X value
+     * @param y the lower left corner Y value
+     * @param w width
+     * @param h height
+     * @param pageNumber the pageNumber of the rectangle
+     * @return true if intersects, false otherwise
+     */
+    default boolean intersectsRectangle(int x, int y, int w, int h, int pageNumber) {
+
+        return getBBox().entrySet().stream().filter(entry -> entry.getKey().getNumber() == pageNumber).map(Map.Entry::getValue).anyMatch(rect -> rect.intersects(x, y, w, h));
+    }
+
+
+    /**
+     * This function is used during insertion of EntityNodes into the graph, it checks if the TextRange of the RedactionEntity intersects or even contains the RedactionEntity.
+     * It sets the fields accordingly and recursively calls this function on all its children.
+     *
+     * @param textEntity RedactionEntity, which is being inserted into the graph
+     */
+    default void addThisToEntityIfIntersects(TextEntity textEntity) {
+
+        TextBlock textBlock = getTextBlock();
+        if (textBlock.getTextRange().intersects(textEntity.getTextRange())) {
+            if (textBlock.containsTextRange(textEntity.getTextRange())) {
+                textEntity.setDeepestFullyContainingNode(this);
+            }
+
+            textEntity.addIntersectingNode(this);
+            streamChildren().filter(semanticNode -> semanticNode.getTextRange().intersects(textEntity.getTextRange()))
+                    .forEach(node -> node.addThisToEntityIfIntersects(textEntity));
+        }
+    }
+
+
+    /**
+     * 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 TextRange is the start and end string offsets in the reading order of the document.
+     *
+     * @return TextRange of this Node's TextBlock
+     */
+    default TextRange getTextRange() {
+
+        return getTextBlock().getTextRange();
+    }
+
+
+    /**
+     * Returns the length of the text content in this Node's TextBlock.
+     *
+     * @return The length of the text content
+     */
+    default int length() {
+
+        return getTextRange().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, atomicTextBlocks) -> bBoxPerPage.put(page, RectangleTransformations.atomicTextBlockBBox(atomicTextBlocks)));
+        return bBoxPerPage;
+    }
+
+}
@@ -0,0 +1,332 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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<TextEntity> 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<TextEntity> 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<TextEntity> 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<TextEntity> streamEntitiesWhereRowContainsEntitiesOfType(List<String> types) {
+
+        List<Integer> rowsWithEntityOfType = getEntities().stream()
+                .filter(TextEntity::active)
+                .filter(redactionEntity -> types.stream().anyMatch(type -> type.equals(redactionEntity.getType())))
+                .map(TextEntity::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<TextEntity> streamEntitiesWhereRowContainsNoEntitiesOfType(List<String> types) {
+
+        return IntStream.range(0, numberOfRows)
+                .boxed()
+                .filter(rowNumber -> streamRow(rowNumber).map(TableCell::getEntities)
+                        .flatMap(Collection::stream)
+                        .filter(TextEntity::active)
+                        .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));
+    }
+
+
+    /**
+     * 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 hasHeaderIgnoreCase(String header) {
+
+        return streamHeaders().anyMatch(tableCellNode -> tableCellNode.getTextBlock().getSearchText().strip().toLowerCase(Locale.ENGLISH).equals(header.toLowerCase(Locale.ENGLISH)));
+    }
+
+
+    /**
+     * 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 textEntity 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<TextEntity> getEntitiesOfTypeInSameRow(String type, TextEntity textEntity) {
+
+        return textEntity.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.model.document.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.model.document.entity.TextEntity;
+import com.iqser.red.service.redaction.v1.server.model.document.DocumentTree;
+import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
+import com.iqser.red.service.redaction.v1.server.model.document.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<TextEntity> 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.model.document.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.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.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
+    TextRange textRange;
+    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)
+                .textRange(new TextRange(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)
+                .textRange(new TextRange(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 TextRange getLineTextRange(int lineNumber) {
+
+        if (lineNumber >= numberOfLines() || lineNumber < 0) {
+            return new TextRange(textRange.start(), textRange.start());
+        }
+        if (numberOfLines() == 1) {
+            return textRange;
+        }
+        if (lineNumber == 0) {
+            return new TextRange(textRange.start(), lineBreaks.get(0) + textRange.start());
+        } else if (lineNumber == numberOfLines() - 1) {
+            return new TextRange(lineBreaks.get(lineBreaks.size() - 1) + textRange.start(), textRange.end());
+        }
+        return new TextRange(lineBreaks.get(lineNumber - 1) + textRange.start(), lineBreaks.get(lineNumber) + textRange.start());
+    }
+
+
+    @Override
+    public List<AtomicTextBlock> getAtomicTextBlocks() {
+
+        return List.of(this);
+    }
+
+
+    @Override
+    public int getNextLinebreak(int fromIndex) {
+
+        return lineBreaks.stream()//
+                .filter(linebreak -> linebreak > fromIndex - textRange.start()) //
+                .findFirst() //
+                .orElse(searchText.length()) + textRange.start();
+    }
+
+
+    @Override
+    public int getPreviousLinebreak(int fromIndex) {
+
+        return lineBreaks.stream()//
+                .filter(linebreak -> linebreak <= fromIndex - textRange.start())//
+                .reduce((a, b) -> b)//
+                .orElse(0) + textRange.start();
+    }
+
+
+    @Override
+    public Rectangle2D getPosition(int stringIdx) {
+
+        return positions.get(stringIdxToPositionIdx.get(stringIdx - textRange.start()));
+    }
+
+
+    @Override
+    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
+
+        if (!containsTextRange(stringTextRange)) {
+            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s", stringTextRange, this.textRange));
+        }
+        if (stringTextRange.length() == 0) {
+            return Collections.emptyList();
+        }
+
+        int startPositionIdx = stringIdxToPositionIdx.get(stringTextRange.start() - this.textRange.start());
+
+        if (stringTextRange.end() == this.textRange.end()) {
+            return positions.subList(startPositionIdx, positions.size());
+        }
+
+        return positions.subList(startPositionIdx, stringIdxToPositionIdx.get(stringTextRange.end() - this.textRange.start()));
+
+    }
+
+
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
+
+        List<Rectangle2D> rectanglesPerLine = stringTextRange.split(getAllLineBreaksInBoundary(stringTextRange))
+                .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(TextRange textRange) {
+
+        if (textRange.length() == 0 || !getTextRange().contains(textRange)) {
+            return "";
+        }
+
+        Set<Integer> lbInBoundary = lineBreaks.stream().map(i -> i + textRange.start()).filter(textRange::contains).collect(Collectors.toSet());
+        if (textRange.end() == getTextRange().end()) {
+            lbInBoundary.add(getTextRange().end());
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = textRange.start(); i < textRange.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(TextRange textRange) {
+
+        return getLineBreaks().stream().map(linebreak -> linebreak + this.textRange.start()).filter(textRange::contains).toList();
+    }
+
+
+    @Override
+    public String toString() {
+
+        return searchText;
+    }
+
+}
@@ -0,0 +1,236 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.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;
+    TextRange textRange;
+
+
+    public static ConcatenatedTextBlock empty() {
+
+        return new ConcatenatedTextBlock(Collections.emptyList());
+    }
+
+
+    public ConcatenatedTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
+
+        this.atomicTextBlocks = new LinkedList<>();
+        if (atomicTextBlocks.isEmpty()) {
+            textRange = new TextRange(-1, -1);
+            return;
+        }
+        var firstTextBlock = atomicTextBlocks.get(0);
+        this.atomicTextBlocks.add(firstTextBlock);
+        textRange = new TextRange(firstTextBlock.getTextRange().start(), firstTextBlock.getTextRange().end());
+
+        atomicTextBlocks.subList(1, atomicTextBlocks.size()).forEach(this::concat);
+    }
+
+
+    public ConcatenatedTextBlock concat(TextBlock textBlock) {
+
+        if (this.atomicTextBlocks.isEmpty()) {
+            textRange.setStart(textBlock.getTextRange().start());
+            textRange.setEnd(textBlock.getTextRange().end());
+        } else if (textRange.end() != textBlock.getTextRange().start()) {
+            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s and %s", textRange, textBlock.getTextRange()));
+        }
+        this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
+        textRange.setEnd(textBlock.getTextRange().end());
+        this.searchText = null;
+        return this;
+    }
+
+
+    private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
+
+        return atomicTextBlocks.stream().filter(textBlock -> textBlock.getTextRange().contains(stringIdx)).findAny().orElseThrow(IndexOutOfBoundsException::new);
+    }
+
+
+    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringBoundary(TextRange textRange) {
+
+        return atomicTextBlocks.stream().filter(tb -> tb.getTextRange().intersects(textRange)).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 TextRange getLineTextRange(int lineNumber) {
+
+        if (atomicTextBlocks.size() == 1) {
+            return atomicTextBlocks.get(0).getLineTextRange(lineNumber);
+        }
+        int lineNumberInCurrentBlock = lineNumber;
+        for (AtomicTextBlock atomicTextBlock : atomicTextBlocks) {
+            if (lineNumberInCurrentBlock < atomicTextBlock.numberOfLines()) {
+                return atomicTextBlock.getLineTextRange(lineNumberInCurrentBlock);
+            }
+            lineNumberInCurrentBlock -= atomicTextBlock.numberOfLines();
+        }
+        return new TextRange(textRange.start(), textRange.start());
+    }
+
+    @Override
+    public List<Rectangle2D> getPositions(TextRange stringTextRange) {
+
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
+
+        if (textBlocks.isEmpty()) {
+            return Collections.emptyList();
+        }
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).getPositions(stringTextRange);
+        }
+
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().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 TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
+
+        return positions;
+    }
+
+
+    @Override
+    public Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange) {
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(stringTextRange);
+
+        if (textBlocks.isEmpty()) {
+            return new HashMap<>();
+        }
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).getPositionsPerPage(stringTextRange);
+        }
+
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        Map<Page, List<Rectangle2D>> rectanglesPerLinePerPage = firstTextBlock.getPositionsPerPage(new TextRange(stringTextRange.start(), firstTextBlock.getTextRange().end()));
+
+        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
+            rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage, textBlock.getPositionsPerPage(textBlock.getTextRange()));
+        }
+
+        AtomicTextBlock lastTextBlock = textBlocks.get(textBlocks.size() - 1);
+        rectanglesPerLinePerPage = mergeEntityPositionsWithSamePageNode(rectanglesPerLinePerPage,
+                lastTextBlock.getPositionsPerPage(new TextRange(lastTextBlock.getTextRange().start(), stringTextRange.end())));
+
+        return rectanglesPerLinePerPage;
+    }
+
+
+    @Override
+    public String subSequenceWithLineBreaks(TextRange textRange) {
+
+        if (textRange.length() == 0 || !getTextRange().contains(textRange)) {
+            return "";
+        }
+
+        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringBoundary(textRange);
+
+        if (textBlocks.size() == 1) {
+            return textBlocks.get(0).subSequenceWithLineBreaks(textRange);
+        }
+
+        StringBuilder sb = new StringBuilder();
+        AtomicTextBlock firstTextBlock = textBlocks.get(0);
+        sb.append(firstTextBlock.subSequenceWithLineBreaks(new TextRange(textRange.start(), firstTextBlock.getTextRange().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 TextRange(lastTextBlock.getTextRange().start(), textRange.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.model.document.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.model.document.TextRange;
+import com.iqser.red.service.redaction.v1.server.model.document.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.utils.RectangleTransformations;
+
+public interface TextBlock extends CharSequence {
+
+    String getSearchText();
+
+
+    List<AtomicTextBlock> getAtomicTextBlocks();
+
+
+    TextRange getTextRange();
+
+
+    int getNextLinebreak(int fromIndex);
+
+
+    int getPreviousLinebreak(int fromIndex);
+
+
+    TextRange getLineTextRange(int lineNumber);
+
+
+
+    List<Integer> getLineBreaks();
+
+
+    Rectangle2D getPosition(int stringIdx);
+
+
+    List<Rectangle2D> getPositions(TextRange stringTextRange);
+
+
+    Map<Page, List<Rectangle2D>> getPositionsPerPage(TextRange stringTextRange);
+
+
+    String subSequenceWithLineBreaks(TextRange textRange);
+
+
+    int numberOfLines();
+
+
+    default CharSequence getLine(int lineNumber) {
+
+        return subSequence(getLineTextRange(lineNumber));
+    }
+
+
+    default List<Rectangle2D> getLinePositions(int lineNumber) {
+
+        return getPositions(getLineTextRange(lineNumber));
+    }
+
+
+    default Rectangle2D getLineBBox(int lineNumber) {
+
+        return RectangleTransformations.rectangle2DBBox(getLinePositions(lineNumber));
+    }
+
+    default String searchTextWithLineBreaks() {
+
+        return subSequenceWithLineBreaks(getTextRange());
+    }
+
+
+    default int indexOf(String searchTerm) {
+
+        return indexOf(searchTerm, getTextRange().start());
+    }
+
+
+    default Set<Page> getPages() {
+
+        return getAtomicTextBlocks().stream().map(AtomicTextBlock::getPage).collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    default Set<Page> getPages(TextRange textRange) {
+
+        return getAtomicTextBlocks().stream()
+                .filter(atomicTextBlock -> atomicTextBlock.getTextRange().intersects(textRange))
+                .map(AtomicTextBlock::getPage)
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+
+    default int indexOf(String searchTerm, int startOffset) {
+
+        int start = getSearchText().indexOf(searchTerm, startOffset - getTextRange().start());
+        if (start == -1) {
+            return -1;
+        }
+        return start + getTextRange().start();
+    }
+
+
+    default CharSequence getFirstLine() {
+
+        return subSequence(getTextRange().start(), getNextLinebreak(getTextRange().start()));
+    }
+
+
+    default boolean containsTextRange(TextRange textRange) {
+
+        if (textRange.end() < textRange.start()) {
+            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", textRange));
+        }
+        return getTextRange().contains(textRange);
+    }
+
+
+    default boolean containsIndex(int stringIndex) {
+
+        return getTextRange().contains(stringIndex);
+    }
+
+
+    default CharSequence subSequence(TextRange textRange) {
+
+        return subSequence(textRange.start(), textRange.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 - getTextRange().start(), end - getTextRange().start());
+    }
+
+
+    @Override
+    default int length() {
+
+        return getTextRange().length();
+    }
+
+
+    @Override
+    default char charAt(int index) {
+
+        return getSearchText().charAt(index - getTextRange().start());
+    }
+
+}
@@ -0,0 +1,49 @@
+package com.iqser.red.service.redaction.v1.server.model.document.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,15 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class BasicQuery {
+
+    String name;
+    int line;
+    String code;
+
+}
@@ -0,0 +1,39 @@
+package com.iqser.red.service.redaction.v1.server.model.drools;
+
+import org.drools.drl.ast.descr.RuleDescr;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@AllArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class BasicRule {
+
+    @EqualsAndHashCode.Include
+    RuleIdentifier identifier;
+    String name;
+    String code;
+    int line;
+
+
+    public static BasicRule fromRuleDescr(RuleDescr rule, String rulesString) {
+
+        RuleIdentifier identifier = RuleIdentifier.fromName(rule.getName());
+        String nameWithoutIdentifier = rule.getName().replace(identifier + ":", "");
+        String code = rulesString.substring(rule.getStartCharacter(), rule.getEndCharacter());
+        return new BasicRule(identifier, nameWithoutIdentifier, code, rule.getLine());
+    }
+
+
+    @Override
+    public String toString() {
+
+        return "BasicRule[identifier=" + identifier + ", name=" + name + ", code=" + code + ']';
+    }
+
+}
--- a/Show More
+++ b/Show More