Fix pmd

Add missing var
Add more logs
2021-02-09 16:19:04 +01:00 · 2021-02-09 14:58:27 +01:00 · 2021-02-09 14:06:27 +01:00 · 2021-02-09 10:36:58 +01:00 · 2021-02-09 10:21:34 +01:00 · 2021-02-08 16:22:26 +01:00
490 changed files with 4515 additions and 3987913 deletions
@@ -1,5 +1,4 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.

 ## [Unreleased]
@@ -1,37 +1,37 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>

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

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

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

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


-    <!-- run 'mvn test' to perform offline validation of the plan -->
-    <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
+  <!-- run 'mvn test' to perform offline validation of the plan -->
+  <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
 </project>
@@ -2,11 +2,8 @@ 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;
@@ -19,15 +16,12 @@ 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;

 /**
@@ -39,15 +33,12 @@ 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) {
+    public static void main(final String[] args) throws Exception {
        //By default credentials are read from the '.credentials' file.
        BambooServer bambooServer = new BambooServer("http://localhost:8085");

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

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

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

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

-        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"))))
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
+
+                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
+
+                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
+                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
+
+                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
+                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
+                                        createJUnitParserTask()
+                                                .description("Resultparser")
+                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                                .enabled(true),
+                                        new InjectVariablesTask()
+                                                .description("Inject git Tag")
+                                                .path("git.tag")
+                                                .namespace("g")
+                                                .scope(InjectVariablesScope.LOCAL),
+                                        new VcsTagTask()
+                                                .description("${bamboo.g.gitTag}")
+                                                .tagName("${bamboo.g.gitTag}")
+                                                .defaultRepository())
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
                .linkedRepositories("RED / " + SERVICE_NAME)
+
                .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
-                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranch()
+                        .delete(new BranchCleanup()
+                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
-
-
-    public Plan createNightPlan() {
-
-        return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests")
-                .variables(new Variable("maven_add_param", "-Dtest-groups=rules-test"))
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new CleanWorkingDirectoryTask().description("Clean working directory.")
-                                        .enabled(true),
-                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
-                                new ScriptTask().description("Build")
-                                        .location(Location.FILE)
-                                        .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                        .argument(SERVICE_NAME + " verify"),
-                                createJUnitParserTask().description("Resultparser")
-                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                        .enabled(true))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters());
-    }
-
-
-    public Plan createSecBuild() {
-
-        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
-                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
-                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
-                                new ScriptTask().description("Sonar").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh").argument(SERVICE_NAME))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .dockerRunArguments("--net=host")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
-    }
-
 }
@@ -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,44 +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
-
-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,5 +1,6 @@
 package buildjob;

+
 import org.junit.Test;

 import com.atlassian.bamboo.specs.api.builders.plan.Plan;
@@ -7,18 +8,10 @@ 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);
    }
-
 }
@@ -7,7 +7,7 @@

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


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

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

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

 ARG PLATFORM_JAR

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

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

@@ -14,6 +13,7 @@
    <groupId>com.iqser.red.service</groupId>
    <version>1.0-SNAPSHOT</version>

+
    <packaging>pom</packaging>

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

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


    <dependencyManagement>
+
        <dependencies>
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.21.0</version>
+                <version>1.1.7</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
+
            <dependency>
                <groupId>org.apache.pdfbox</groupId>
                <artifactId>pdfbox</artifactId>
@@ -46,48 +47,9 @@
                <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>
+</project>
@@ -11,51 +11,11 @@

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

-    <properties>
-        <persistence-service.version>1.299.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-api-v1</artifactId>
-            <version>${persistence-service.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>redaction-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>
@@ -1,40 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
 public class AnalyzeRequest {

-    private MessageType messageType;
-
-    private String dossierId;
-    private String fileId;
-    private String dossierTemplateId;
+    private byte[] document;
+    private String ruleSetId;
    private ManualRedactions manualRedactions;
-    private OffsetDateTime lastProcessed;
-    private int analysisNumber;
-
-    @Builder.Default
-    private Set<Integer> excludedPages = new HashSet<>();
-    @Builder.Default
-    private Set<Integer> sectionsToReanalyse = new HashSet<>();
-
-    @Builder.Default
-    private List<FileAttribute> fileAttributes = new ArrayList<>();
-
 }
-
@@ -1,9 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,26 +11,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnalyzeResult {

-    private MessageType messageType;
-
-    private String dossierId;
-    private String fileId;
-    private long duration;
    private int numberOfPages;
-    private boolean hasUpdates;
-    private long dictionaryVersion;
-    private long dossierDictionaryVersion;
-    private long rulesVersion;
-    private long legalBasisVersion;
-
-    private boolean wasReanalyzed;
-
-    private int analysisVersion;
-    private int analysisNumber;
-
-    private ManualRedactions manualRedactions;
-
-    private Set<FileAttribute> addedFileAttributes;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;

 }
-
@@ -9,8 +9,9 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class ReanalyzeResult {
+public class AnnotateRequest {

+    private byte[] document;
    private RedactionLog redactionLog;
-
+    private SectionGrid sectionGrid;
 }
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.annotate;
+package com.iqser.red.service.redaction.v1.model;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,5 +12,4 @@ import lombok.NoArgsConstructor;
 public class AnnotateResponse {

    private byte[] document;
-
 }
@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Argument {
-
-    private String name;
-    private ArgumentType type;
-
-}
@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum ArgumentType {
-
-    INTEGER,
-    BOOLEAN,
-    STRING,
-    FILE_ATTRIBUTE,
-    REGEX,
-    TYPE,
-    RULE_NUMBER,
-    LEGAL_BASIS,
-    REFERENCE_TYPE
-
-}
@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum ChangeType {
-    ADDED,
-    REMOVED,
-    CHANGED
-}
@@ -1,20 +1,21 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Change {
+public class Comment {

-    private int analysisNumber;
-    private ChangeType type;
-    private OffsetDateTime dateTime;
+    private String id;
+    private OffsetDateTime date;
+    private String text;
+    private String user;

 }
@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Engine {
-    DICTIONARY,
-    NER,
-    RULE
-}
@@ -7,13 +7,13 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@NoArgsConstructor
@AllArgsConstructor
-public class FileAttribute {
+@NoArgsConstructor
+public class IdRemoval {

    private String id;
-    private String label;
-    private String placeholder;
-    private String value;
+    private String user;
+    private Status status;
+    private boolean removeFromDictionary;

-}
+}
@@ -1,24 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import com.dslplatform.json.CompiledJson;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@Builder
-@CompiledJson
-@NoArgsConstructor
-@AllArgsConstructor
-public class ImportedRedactions {
-
-    @Builder.Default
-    private Map<Integer, List<ImportedRedaction>> importedRedactions = new HashMap<>();
-
-}
@@ -1,59 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.BaseAnnotation;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ManualChange {
-
-    private AnnotationStatus annotationStatus;
-    private ManualRedactionType manualRedactionType;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime requestedDate;
-    private String userId;
-    private Map<String, String> propertyChanges = new HashMap<>();
-
-
-    public static ManualChange from(BaseAnnotation baseAnnotation) {
-
-        ManualChange manualChange = new ManualChange();
-        manualChange.annotationStatus = baseAnnotation.getStatus();
-        manualChange.processedDate = baseAnnotation.getProcessedDate();
-        manualChange.requestedDate = baseAnnotation.getRequestDate();
-        manualChange.userId = baseAnnotation.getUser();
-        return manualChange;
-    }
-
-
-    public boolean isProcessed() {
-
-        return processedDate != null;
-    }
-
-
-    public ManualChange withManualRedactionType(ManualRedactionType manualRedactionType) {
-
-        this.manualRedactionType = manualRedactionType;
-        return this;
-    }
-
-
-    public ManualChange withChange(String property, String value) {
-
-        this.propertyChanges.put(property, value);
-        return this;
-    }
-
-}
@@ -1,22 +1,30 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

    private String id;
-
-    @Builder.Default
+    private String user;
+    private String type;
+    private String value;
+    private String reason;
+    private String legalBasis;
    private List<Rectangle> positions = new ArrayList<>();
+    private Status status;
+    private boolean addToDictionary;
+
+    private String section;
+    private int sectionNumber;

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

 public enum ManualRedactionType {
-    ADD_LOCALLY,
-    ADD_TO_DICTIONARY,
-    REMOVE_LOCALLY,
-    REMOVE_FROM_DICTIONARY,
-    FORCE_REDACT,
-    FORCE_HINT,
-    RECATEGORIZE,
-    LEGAL_BASIS_CHANGE,
-    RESIZE
+    ADD, REMOVE
 }
@@ -0,0 +1,29 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualRedactions {
+
+    @Builder.Default
+    private Set<IdRemoval> idsToRemove = new HashSet<>();
+
+    @Builder.Default
+    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
+
+    @Builder.Default
+    private Map<String, List<Comment>> comments = new HashMap<>();
+
+}
@@ -1,10 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum MessageType {
-
-    ANALYSE,
-    REANALYSE,
-    STRUCTURE_ANALYSE,
-    SURROUNDING_TEXT
-
-}
@@ -14,5 +14,4 @@ public class Rectangle {
    private float height;

    private int page;
-
 }
@@ -1,37 +1,32 @@
 package com.iqser.red.service.redaction.v1.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
@AllArgsConstructor
@NoArgsConstructor
 public class RedactionLog {

-    /**
-     * Version 0 Redaction Logs have manual redactions merged inside them
-     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
-     */
-    private long analysisVersion;
-
-    /**
-     * Which analysis created this redactionLog.
-     */
-    private int analysisNumber;
-
-    private List<RedactionLogEntry> redactionLogEntry = new ArrayList<>();
-    private List<RedactionLogLegalBasis> legalBasis = new ArrayList<>();
+    private List<RedactionLogEntry> redactionLogEntry;

    private long dictionaryVersion = -1;
-    private long dossierDictionaryVersion = -1;
    private long rulesVersion = -1;
-    private long legalBasisVersion = -1;
+
+    private String ruleSetId;
+    private String filename;
+
+
+    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
+
+        this.redactionLogEntry = redactionLogEntry;
+        this.dictionaryVersion = dictionaryVersion;
+        this.rulesVersion = rulesVersion;
+        this.ruleSetId = ruleSetId;
+    }
+

 }
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class RedactionLogChanges {
-
-    private RedactionLog redactionLog;
-    private boolean hasChanges;
-
-}
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionLogComment {
-
-    private long id;
-    private String user;
-    private String text;
-    private String annotationId;
-    private String fileId;
-    private OffsetDateTime date;
-    private OffsetDateTime softDeletedTime;
-
-}
@@ -1,16 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import java.util.ArrayList;
+import java.util.List;

-import lombok.*;
-
-import java.util.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;

@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@EqualsAndHashCode
 public class RedactionLogEntry {

    private String id;
@@ -18,79 +19,25 @@ public class RedactionLogEntry {
    private String value;
    private String reason;
    private int matchedRule;
-    private boolean rectangle;
    private String legalBasis;
-
-    private boolean imported;
-
    private boolean redacted;
    private boolean isHint;
    private boolean isRecommendation;
-    private boolean isFalsePositive;
-
    private String section;
    private float[] color;

    @Builder.Default
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
+    private boolean manual;
+    private Status status;
+    private ManualRedactionType manualRedactionType;
+    private boolean isDictionaryEntry;

    private String textBefore;
    private String textAfter;

    @Builder.Default
-    private List<RedactionLogComment> comments = new ArrayList<>();
-
-    private int startOffset;
-    private int endOffset;
-
-    private boolean isImage;
-    private boolean imageHasTransparency;
-
-    private boolean isDictionaryEntry;
-    private boolean isDossierDictionaryEntry;
-
-    private boolean excluded;
-
-    private String sourceId;
-
-    @EqualsAndHashCode.Exclude
-    @Builder.Default
-    private List<Change> changes = new ArrayList<>();
-
-    @EqualsAndHashCode.Exclude
-    @Builder.Default
-    private List<ManualChange> manualChanges = new ArrayList<>();
-
-    private Set<Engine> engines = new HashSet<>();
-
-    private Set<String> reference = new HashSet<>();
-
-    @Builder.Default
-    private Set<String> importedRedactionIntersections = new HashSet<>();
-
-
-    public boolean lastChangeIsRemoved() {
-
-        return last(changes).map(c -> c.getType() == ChangeType.REMOVED).orElse(false);
-    }
-
-
-    public boolean isLocalManualRedaction() {
-
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
-    }
-
-
-    public boolean isManuallyRemoved() {
-
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
-    }
-
-
-    private <T> Optional<T> last(List<T> list) {
-
-        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(list.size() - 1));
-    }
+    private List<Comment> comments = new ArrayList<>();

 }
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionLogLegalBasis {
-
-    private String name;
-    private String description;
-    private String reason;
-
-}
@@ -1,34 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
 public class RedactionRequest {

-    private String dossierId;
-    private String fileId;
-    private String dossierTemplateId;
+    private byte[] document;
+    private String ruleSetId;
    private ManualRedactions manualRedactions;
-    @Builder.Default
-    private Set<Integer> excludedPages = new HashSet<>();
-
-    private Colors colors;
-    private List<Type> types;
-
-    private boolean includeFalsePositives;
-
 }
@@ -13,5 +13,7 @@ public class RedactionResult {

    private byte[] document;
    private int numberOfPages;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;

 }
@@ -1,14 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class RuleBuilderModel {
-
-    private List<RuleElement> whenClauses = new ArrayList<>();
-    private List<RuleElement> thenConditions = new ArrayList<>();
-
-}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class RuleElement {
-
-    private String conditionName;
-    private List<Argument> arguments = new ArrayList<>();
-
-}
@@ -1,34 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SectionArea {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-    private int page;
-    private String header;
-
-
-    public boolean contains(Rectangle other) {
-
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft()
-                .getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft()
-                .getY() + other.getHeight();
-    }
-
-
-    // TODO we should only use one rectangle class.
-    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
-
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft()
-                .getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
-    }
-
-}
@@ -1,33 +1,18 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.dslplatform.json.CompiledJson;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.*;
-
@Data
-@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
 public class SectionGrid {

    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();

-    private List<SectionGridSection> sections = new ArrayList<>();
-
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class SectionGridSection {
-
-        private int sectionNumber;
-        private String headline;
-        private Set<Integer> pages;
-        private List<SectionArea> sectionAreas;
-
-    }
-
 }
@@ -1,22 +1,33 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import java.util.List;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
+@RequiredArgsConstructor
 public class SectionRectangle {

+    @NonNull
    private Point topLeft;
+
+    @NonNull
    private float width;
+
+    @NonNull
    private float height;
+
+    @NonNull
    private int part;
+
+    @NonNull
    private int numberOfParts;

    private List<CellRectangle> tableCells;
-
 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class StructureAnalyzeRequest {
-
-    private String dossierId;
-    private String fileId;
-
-}
-
@@ -1,10 +1,11 @@
 package com.iqser.red.service.redaction.v1.resources;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
-
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,27 +13,30 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

+    String SERVICE_NAME = "redaction-service-v1";
+
+    String RULE_SET_PARAMETER_NAME = "ruleSetId";
+    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
+
+    @PostMapping(value = "/analyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest);
+
+    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
+
    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);

-
    @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult sections(@RequestBody RedactionRequest redactionRequest);

-
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

+    @PostMapping(value = "/rules/update"+RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId);

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

-
-    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
-
-
-    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId, @PathVariable("fileId") String fileId, @RequestBody ManualRedactions manualRedactions);
-
-}
+}
@@ -1,13 +0,0 @@
-package com.iqser.red.service.redaction.v1.resources;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-
-public interface RuleBuilderResource {
-
-    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
-    RuleBuilderModel getRuleBuilderModel();
-
-}
@@ -10,77 +10,41 @@
    </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>
+        <slf4j.version>1.7.30</slf4j.version>
    </properties>

    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>storage-commons</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-afterburner</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ahocorasick</groupId>
-            <artifactId>ahocorasick</artifactId>
-            <version>${ahocorasick.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javaassist.version}</version>
-        </dependency>
-
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>configuration-service-api-v1</artifactId>
+            <version>2.0.0</version>
+        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>${drools.version}</version>
+            <version>7.37.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>${kie.version}</version>
+            <version>7.37.0.Final</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
            <artifactId>jts-core</artifactId>
-            <version>${locationtech.version}</version>
+            <version>1.16.1</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
        </dependency>
-
        <!-- commons -->
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -95,6 +59,10 @@
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -103,17 +71,21 @@
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox-tools</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
        <!-- spring -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
-
+        <!-- ribbon must be included because transitive a dependency on it.-->
        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
        </dependency>
-
        <!-- test dependencies -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -129,18 +101,6 @@

    <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>
@@ -3,36 +3,24 @@ package com.iqser.red.service.redaction.v1.server;
 import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

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

    public static void main(String[] args) {
-
-        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
        SpringApplication.run(Application.class, args);
    }


-    @Bean
-    public TimedAspect timedAspect(MeterRegistry registry) {
-
-        return new TimedAspect(registry);
-    }
-
-}
+}
@@ -1,10 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

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

+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;

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

    private List<Page> pages = new ArrayList<>();
-    private List<Section> sections = 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 Map<Integer, List<Entity>> entities = new HashMap<>();
    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
-    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter= new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter= new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
    private boolean headlines;

+    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
-    private DictionaryVersion dictionaryVersion;
+    private long dictionaryVersion;
    private long rulesVersion;
-
 }
@@ -1,7 +1,5 @@
 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;
@@ -9,39 +7,38 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

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

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

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

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

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


-    public List<Float> getHighterThanMostPopular() {

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


-    public Float getHighest() {
-
+    public Float getHighest(){
        Float highest = null;
-        for (Float value : countPerValue.keySet()) {
-            if (highest == null || value > highest) {
+        for(Float value: countPerValue.keySet()){
+            if (highest == null){
+                highest = value;
+            } else if(value > highest){
                highest = value;
            }
        }
@@ -1,14 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
+
 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 {
@@ -16,8 +14,6 @@ public class Footer {
    private List<TextBlock> textBlocks;


-    @JsonIgnore
-    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {

        SearchableText searchableText = new SearchableText();
@@ -25,4 +21,4 @@ public class Footer {
        return searchableText;
    }

-}
+}
@@ -1,14 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.List;
+
 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 {
@@ -16,8 +14,6 @@ public class Header {
    private List<TextBlock> textBlocks;


-    @JsonIgnore
-    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {

        SearchableText searchableText = new SearchableText();
@@ -25,4 +21,4 @@ public class Header {
        return searchableText;
    }

-}
+}
@@ -1,8 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-public enum Orientation {
-
-    NONE,
-    LEFT,
-    RIGHT
-}
@@ -1,13 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import java.util.ArrayList;
+import java.awt.geom.Rectangle2D;
 import java.util.List;

-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.Data;
 import lombok.NonNull;
@@ -20,7 +17,7 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

-    private List<PdfImage> images = new ArrayList<>();
+    private List<Rectangle2D> imageBounds;

    private Rectangle bodyTextFrame;

@@ -34,13 +31,8 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

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

-}
+}
@@ -1,29 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
@Data
@NoArgsConstructor
-public class Section implements Comparable {
+public class Paragraph {

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


@@ -62,16 +53,4 @@ public class Section implements Comparable {
        return textBlocks;
    }

-
-    @Override
-    public int compareTo(Object o) {
-
-        return 0;
-    }
-
-
-
-
-
-
-}
+}
@@ -1,70 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.redaction.v1.model.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.Paragraph;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@CompiledJson
-@NoArgsConstructor
-@AllArgsConstructor
-public class SectionText {
-
-    private int sectionNumber;
-    private String text;
-
-    private boolean isTable;
-    private String headline;
-    List<Paragraph> paragraphs;
-
-    @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,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

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

+import lombok.Getter;
+
 public class StringFrequencyCounter {

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

        Map.Entry<String, Integer> mostPopular = null;
        for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
+            if (mostPopular == null) {
+                mostPopular = entry;
+            } else if (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<>();
-
-}
@@ -3,191 +3,34 @@ 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 com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

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

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

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

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

-    @JsonIgnore
    private float highestFontSize;

-    @JsonIgnore
    private String classification;

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

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

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

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

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

-
    public TextBlock copy() {
-
-        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation, indexOnPage);
+        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);
@@ -269,6 +98,7 @@ public class TextBlock extends AbstractTextContainer {
    }


+
    @Override
    public String toString() {

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

    }

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

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

    }

-}
+}
@@ -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,87 +1,49 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

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

 import org.springframework.stereotype.Service;

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

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

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

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

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

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

-            boolean lineSeparation = 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());
+            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
+            boolean startFromTop = word.getY1() > maxY + word.getHeight();

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

+                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;
@@ -92,82 +54,30 @@ public class BlockificationService {
            chunkWords.add(word);

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

-        TextBlock cb1 = buildTextBlock(chunkWords, indexOnPage);
+        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, int indexOnPage) {
+    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {

        TextBlock textBlock = null;

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

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

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

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


-    private boolean 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) {
+    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {

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


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

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

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

 import org.springframework.stereotype.Service;

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

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

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


    public void classifyDocument(Document document) {

-        Rectangle bodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
-        Rectangle landscapeBodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
+        Rectangle bodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
+        Rectangle landscapeBodyTextFrame = blockificationService.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);
+            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
+            page.setBodyTextFrame(btf);
+            classifyPage(btf, page, document, headlineFontSizes);
        }
    }


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

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


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

        if (document.getFontSizeCounter().getMostPopular() == null) {
-            textBlock.setClassification("Other");
+            // TODO Figure out why this happens.
            return;
        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (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())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (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)) {
+        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
+                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
+                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
+                .getMostPopular() || page.getTextBlocks().size() == 1)) {
            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()) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {

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

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

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

 import lombok.experimental.UtilityClass;

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

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

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

        double threshold = textBlock.getMostPopularWordHeight() * 3;

-        if (textBlock.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()) {
+        if (textBlock.getMinX() + threshold > btf.getX() &&
+                textBlock.getMaxX() - threshold < btf.getX() + btf.getWidth() &&
+                textBlock.getMinY() + threshold > btf.getY() &&
+                textBlock.getMaxY() - threshold < btf.getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -30,27 +32,16 @@ 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 isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {
+    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, boolean rotated) {

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

-        if (rotation == 90 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
+        if (rotated && textBlock.getMinX() < btf.getX()) {
+            // Its very strange, P{0,0} is on top left in this case, instead of lower left.
            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()) {
+        } else if (!rotated && textBlock.getMinY() > btf.getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -58,27 +49,16 @@ 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 isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {
+
+    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
+
+        //TODO Currently this is not working for rotated pages.

        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()) {
+        if (textBlock.getMaxY() < btf.getY()) {
            return true;
        } else {
            return false;
@@ -86,8 +66,7 @@ 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 isTouchingUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {

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

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


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


    public Float getApproxLineCount(TextBlock textBlock) {
-
        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
    }
-
 }
@@ -1,67 +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 yAdj = 0f;
-        if (dir == 0 || dir == 180) {
-            yAdj = pageHeight - getYLowerLeftRot(x, y, dir, pageWidth, pageHeight);
-        } else {
-            yAdj = pageWidth - getYLowerLeftRot(x, y, dir, pageWidth, pageHeight);
-        }
-        return new Point2D.Float(xAdj, yAdj);
-    }
-
-
-    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 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;
-
-@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
 public interface DictionaryClient extends DictionaryResource {
-
 }
@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
-
-@FeignClient(name = "EntityRecognitionClient", url = "${entity-recognition-service.url}")
-public interface EntityRecognitionClient {
-
-    @PostMapping(value = "/find_authors", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    NerEntities findAuthors(EntityRecognitionRequest entityRecognitionRequest);
-
-}
@@ -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.resources.FileStatusProcessingUpdateResource;
-
-@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
-public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
-
-}
@@ -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.resources.LegalBasisMappingResource;
-
-@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
-public interface LegalBasisClient extends LegalBasisMappingResource {
-
-}
@@ -1,100 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-public class MockMultipartFile implements MultipartFile {
-
-    private final String name;
-    private final String originalFilename;
-    @Nullable
-    private final String contentType;
-    private final byte[] content;
-
-
-    public MockMultipartFile(String name, @Nullable byte[] content) {
-
-        this(name, "", null, content);
-    }
-
-
-    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
-
-        this(name, "", null, FileCopyUtils.copyToByteArray(contentStream));
-    }
-
-
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, @Nullable byte[] content) {
-
-        Assert.hasLength(name, "Name must not be empty");
-        this.name = name;
-        this.originalFilename = originalFilename != null ? originalFilename : "";
-        this.contentType = contentType;
-        this.content = content != null ? content : new byte[0];
-    }
-
-
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, InputStream contentStream) throws IOException {
-
-        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
-    }
-
-
-    public String getName() {
-
-        return this.name;
-    }
-
-
-    @NonNull
-    public String getOriginalFilename() {
-
-        return this.originalFilename;
-    }
-
-
-    @Nullable
-    public String getContentType() {
-
-        return this.contentType;
-    }
-
-
-    public boolean isEmpty() {
-
-        return this.content.length == 0;
-    }
-
-
-    public long getSize() {
-
-        return this.content.length;
-    }
-
-
-    public byte[] getBytes() {
-
-        return this.content;
-    }
-
-
-    public InputStream getInputStream() {
-
-        return new ByteArrayInputStream(this.content);
-    }
-
-
-    public void transferTo(File dest) throws IOException, IllegalStateException {
-
-        FileCopyUtils.copy(this.content, dest);
-    }
-
-}
@@ -1,10 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;

-import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;
-
-@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
+@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
-
-}
+}
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import com.dslplatform.json.CompiledJson;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@CompiledJson
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecogintionEntity {
-
-    private String value;
-    private int startOffset;
-    private int endOffset;
-    private String type;
-
-}
@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionRequest {
-
-    private List<EntityRecognitionSection> data;
-
-}
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionResult {
-
-    @Builder.Default
-    private Map<Integer, List<EntityRecogintionEntity>> entities = new HashMap<>();
-
-}
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class EntityRecognitionSection {
-
-    private int sectionNumber;
-    private String text;
-
-}
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.dslplatform.json.CompiledJson;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@CompiledJson
-@NoArgsConstructor
-@AllArgsConstructor
-public class NerEntities {
-
-    private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
-
-}
@@ -1,18 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.controller;

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

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

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

    /* error handling */

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

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

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

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.resources.RedactionResource;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;

@Slf4j
@RestController
@@ -36,36 +40,79 @@ import lombok.extern.slf4j.Slf4j;
 public class RedactionController implements RedactionResource {

    private final PdfVisualisationService pdfVisualisationService;
-    private final DroolsExecutionService droolsExecutionService;
    private final PdfSegmentationService pdfSegmentationService;
-    private final RedactionStorageService redactionStorageService;
-    private final RedactionLogMergeService redactionLogMergeService;
-    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final EntityRedactionService entityRedactionService;
+    private final DroolsExecutionService droolsExecutionService;
+    private final DictionaryService dictionaryService;
+    private final AnnotationService annotationService;


    @Override
-    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
+    public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
-                redactionRequest.getFileId(),
-                FileType.ORIGIN));
-        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);
+        log.info("Starting redaction analysis...");
+        long startTime = System.currentTimeMillis();

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
-                    redactionRequest.getFileId(),
-                    FileType.ORIGIN));
-            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
-                pdDocument.setAllSecurityToBeRemoved(true);
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-                pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);

-                return convert(pdDocument, classifiedDoc.getPages().size());
+            log.info("Document structure analysis successful, starting redaction analysis...");

-            } catch (IOException e) {
-                throw new RedactionException(e);
+            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
+            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
+                    .getRuleSetId());
+
+            log.info("Redaction analysis successful...");
+
+            log.debug("Finishing redaction analysis took: {}.", System.currentTimeMillis() - startTime);
+
+            return AnalyzeResult.builder()
+                    .sectionGrid(classifiedDoc.getSectionGrid())
+                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
+                    .getRulesVersion(), analyzeRequest.getRuleSetId()))
+                    .numberOfPages(classifiedDoc.getPages().size())
+                    .build();
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+    }
+
+
+    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {
+
+            pdDocument.setAllSecurityToBeRemoved(true);
+            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
+            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());
+
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
            }

+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+    }
+
+
+    @Override
+    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);
+
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
+
+            return convert(pdDocument, classifiedDoc.getPages().size(), pdfSegmentationRequest.getRuleSetId());
+
        } catch (IOException e) {
            throw new RedactionException(e);
        }
@@ -76,24 +123,13 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
-                redactionRequest.getFileId(),
-                FileType.ORIGIN));
-        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
-                    redactionRequest.getFileId(),
-                    FileType.ORIGIN));
-            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
-                pdDocument.setAllSecurityToBeRemoved(true);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);

-                pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
-                return convert(pdDocument, classifiedDoc.getPages().size());
-
-            } catch (IOException e) {
-                throw new RedactionException(e);
-            }
+            return convert(pdDocument, classifiedDoc.getPages().size(), redactionRequest.getRuleSetId());

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -105,66 +141,64 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {

-        Document classifiedDoc;
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            pdDocument.setAllSecurityToBeRemoved(true);

-        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
-                    redactionRequest.getFileId(),
-                    FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);
-        } catch (Exception e) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+
+            StringBuilder sb = new StringBuilder();
+            for (Page page : classifiedDoc.getPages()) {
+                for (AbstractTextContainer textContainer : page.getTextBlocks()) {
+                    if (textContainer instanceof Table) {
+                        Table table = (Table) textContainer;
+                        sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
+                    }
+                }
+            }
+
+            return RedactionResult.builder().document(sb.toString().getBytes()).build();
+
+        } catch (IOException e) {
            throw new RedactionException(e);
        }

-        StringBuilder sb = new StringBuilder();
-        for (Page page : classifiedDoc.getPages()) {
-            for (AbstractTextContainer textContainer : page.getTextBlocks()) {
-                if (textContainer instanceof Table) {
-                    Table table = (Table) textContainer;
-                    sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
-                }
-            }
-        }
+    }

-        return RedactionResult.builder().document(sb.toString().getBytes()).build();

+    @Override
+    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
+
+        droolsExecutionService.updateRules(ruleSetId);
    }


    @Override
    public void testRules(@RequestBody String rules) {

-        try {
-            droolsExecutionService.testRules(rules);
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
-        }
+        droolsExecutionService.testRules(rules);
    }


-    @Override
-    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
+    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {

-        return redactionLogMergeService.provideRedactionLog(redactionRequest);
+        return convert(document, numberOfPages, null, null, 0, 0, ruleSetId);
    }


-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
+    private RedactionResult convert(PDDocument document, int numberOfPages,
+                                    List<RedactionLogEntry> redactionLogEntities, SectionGrid sectionGrid,
+                                    long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
-            return RedactionResult.builder().document(byteArrayOutputStream.toByteArray()).numberOfPages(numberOfPages).build();
+            return RedactionResult.builder()
+                    .document(byteArrayOutputStream.toByteArray())
+                    .numberOfPages(numberOfPages)
+                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
+                    .sectionGrid(sectionGrid)
+                    .build();
        }

    }

-
-    @Override
-    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId, @PathVariable("fileId") String fileId, @RequestBody ManualRedactions manualRedactions) {
-
-        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
-        log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());
-        return result.getManualRedactions();
-    }
-
 }
@@ -1,24 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.controller;
-
-import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
-import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
-import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
-
-import lombok.RequiredArgsConstructor;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequiredArgsConstructor
-public class RuleBuilderController implements RuleBuilderResource {
-
-    private final RuleBuilderModelService ruleBuilderModelService;
-
-
-    @Override
-    public RuleBuilderModel getRuleBuilderModel() {
-
-        return ruleBuilderModelService.getRuleBuilderModel();
-    }
-
-}
@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.data;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class AtomicTextBlockData {
-    Long id;
-    String searchText;
-    int start;
-    int end;
-    int[] lineBreaks;
-    int[] stringIdxToPositionIdx;
-    float[][] positions;
-}
@@ -1,19 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.data;
-
-import java.util.List;
-
-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 {
-    List<PageData> pages;
-    List<AtomicTextBlockData> atomicTextBlocks;
-    TableOfContentsData tableOfContents;
-}
@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.data;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class PageData {
-    int number;
-    int height;
-    int width;
-
-    Long header;
-    Long footer;
-}
@@ -1,52 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.data;
-
-import static java.lang.String.format;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.management.openmbean.InvalidKeyException;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class TableOfContentsData {
-
-    List<EntryData> entries;
-
-
-    public EntryData get(String tocId) {
-
-        List<Integer> ids = getIds(tocId);
-        if (ids.size() < 1) {
-            throw new InvalidKeyException(format("Section Identifier: \"%s\" is not valid.", tocId));
-        }
-        EntryData entry = entries.get(ids.get(0));
-        for (int id : ids.subList(1, ids.size())) {
-            entry = entry.subEntries().get(id);
-        }
-        return entry;
-    }
-
-
-    private static List<Integer> getIds(String idsAsString) {
-
-        return Arrays.stream(idsAsString.split("\\.")).map(Integer::valueOf).toList();
-    }
-
-
-    @Builder
-    public record EntryData(String tocId, List<EntryData> subEntries, NodeType type, Long atomicTextBlock, Long page, int numberOnPage) {
-
-    }
-
-}
@@ -1,88 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
-
-import static java.lang.String.format;
-
-import lombok.Setter;
-
-@Setter
-public class Boundary {
-
-    private int start;
-    private int end;
-
-
-    public Boundary(int start, int end) {
-
-        assert start <= end;
-        this.start = start;
-        this.end = end;
-    }
-
-
-    public int length() {
-
-        return end - start;
-    }
-
-
-    public int start() {
-
-        return start;
-    }
-
-
-    public int end() {
-
-        return end;
-    }
-
-
-    public boolean contains(Boundary boundary) {
-
-        return start <= boundary.start() && boundary.end() <= end;
-    }
-
-
-    public boolean containedBy(Boundary boundary) {
-
-        return boundary.start() <= start && end <= boundary.end();
-    }
-
-
-    public boolean contains(int start, int end) {
-
-        if (start > end) {
-            throw new UnsupportedOperationException("start > end");
-        }
-        return this.start <= start && end <= this.end;
-    }
-
-
-    public boolean containedBy(int start, int end) {
-
-        if (start > end) {
-            throw new UnsupportedOperationException("start > end");
-        }
-        return start <= this.start && this.end <= end;
-    }
-
-
-    public boolean contains(int index) {
-
-        return start <= index && index < end;
-    }
-
-
-    public boolean intersects(Boundary boundary) {
-
-        return contains(boundary.start()) || contains(boundary.end());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return format("Boundary [%d|%d)", start, end);
-    }
-
-}
@@ -1,96 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
-
-import static com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentUtility.enrichEntity;
-
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.DocumentGraphNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.EntityNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SectionNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.ConcatenatedTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class DocumentGraph {
-
-    List<SectionNode> sections;
-    List<PageNode> pages;
-    TableOfContents tableOfContents;
-    Integer numberOfPages;
-    TextBlock text;
-
-
-    public ConcatenatedTextBlock buildTextBlock() {
-
-        return streamAtomicTextBlocksInOrder().collect(new TextBlockCollector());
-    }
-
-
-    public Stream<AtomicTextBlock> streamAtomicTextBlocksInOrder() {
-
-        return Stream.concat(//
-                streamAllNodes().filter(DocumentGraphNode::isTerminal).map(DocumentGraphNode::getAtomicTextBlock),//
-                Stream.concat(//
-                        pages.stream().map(PageNode::getHeader),//
-                        pages.stream().map(PageNode::getFooter)));
-    }
-
-
-    public EntityNode createAndAddEntity(Boundary boundary, String type, EntityType entityType) {
-
-        EntityNode entity = EntityNode.initialEntityNode(boundary, type, entityType);
-        addEntityToGraphAndSetFields(entity);
-        return entity;
-    }
-
-
-    public void addEntityToGraphAndSetFields(EntityNode entity) {
-
-        try {
-            boolean inserted = streamAllNodes().anyMatch(node -> node.addEntityAndSetFieldsIfStartIndexContained(entity));
-        } catch (NotFoundException e) {
-            enrichEntity(entity, text);
-            log.warn("Entity \"{}\" with {} is in between two main sections and will be removed!", entity.getValue(), entity.getBoundary());
-            entity.removeFromGraph();
-        }
-    }
-
-
-    public Set<EntityNode> getEntities() {
-
-        return streamAllNodes().filter(DocumentGraphNode::isTerminal).map(DocumentGraphNode::getEntities).flatMap(List::stream).collect(Collectors.toSet());
-    }
-
-
-    private Stream<DocumentGraphNode> streamAllNodes() {
-
-        return tableOfContents.streamEntriesInOrder().map(TableOfContents.Entry::node);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return text.toString();
-    }
-
-}
@@ -1,113 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph;
-
-import static java.lang.String.format;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import javax.management.openmbean.InvalidKeyException;
-
-import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.DocumentGraphNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-
-import lombok.Data;
-
-@Data
-public class TableOfContents {
-
-    List<Entry> entries;
-
-
-    public TableOfContents() {
-
-        entries = new LinkedList<>();
-    }
-
-
-    public String createNewEntryAndReturnId(NodeType nodeType, String summary, DocumentGraphNode node) {
-
-        String id = String.format("%d", entries.size());
-        entries.add(new Entry(nodeType, id, summary, new LinkedList<>(), node));
-        return id;
-    }
-
-
-    public String createNewChildEntryAndReturnId(String parentId, NodeType nodeType, String summary, DocumentGraphNode node) {
-
-        Entry parent = getEntryById(parentId);
-        String childId = parentId + String.format(".%d", parent.children().size());
-        parent.children().add(new Entry(nodeType, childId, summary, new LinkedList<>(), node));
-        return childId;
-    }
-
-
-    public Entry getEntryById(String parentId) {
-
-        List<Integer> ids = getIds(parentId);
-        if (ids.size() < 1) {
-            throw new InvalidKeyException(format("Section Identifier: \"%s\" is not valid.", parentId));
-        }
-        Entry entry = entries.get(ids.get(0));
-        for (int id : ids.subList(1, ids.size())) {
-            entry = entry.children().get(id);
-        }
-        return entry;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return String.join("\n", streamEntriesInOrder().map(Entry::toString).toList());
-    }
-
-
-    public String toString(String id) {
-
-        return String.join("\n", streamSubEntriesInOrder(id).map(Entry::toString).toList());
-    }
-
-
-    public Stream<Entry> streamEntriesInOrder() {
-
-        return entries.stream().flatMap(TableOfContents::flatten);
-    }
-
-
-    public Stream<Entry> streamSubEntriesInOrder(String parentId) {
-
-        return Stream.of(getEntryById(parentId)).flatMap(TableOfContents::flatten);
-    }
-
-
-    private static List<Integer> getIds(String idsAsString) {
-
-        return Arrays.stream(idsAsString.split("\\.")).map(Integer::valueOf).toList();
-    }
-
-
-    private static Stream<Entry> flatten(Entry entry) {
-
-        return Stream.concat(Stream.of(entry), entry.children().stream().flatMap(TableOfContents::flatten));
-    }
-
-
-    public record Entry(NodeType type, String id, String summary, List<Entry> children, DocumentGraphNode node) {
-
-        @Override
-        public String toString() {
-
-            return id + ": " + type + ".: " + summary;
-        }
-
-
-        @Override
-        public int hashCode() {
-            return Hashing.murmur3_32_fixed().hashString(type + id + summary + children.hashCode(), StandardCharsets.UTF_8).hashCode();
-        }
-    }
-}
@@ -1,219 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import static com.iqser.red.service.redaction.v1.server.document.services.EntityEnrichmentUtility.enrichEntity;
-import static java.lang.String.format;
-
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlock;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-
-public interface DocumentGraphNode {
-
-    /**
-     * Searches all Nodes located underneath this Node in the TableOfContents and concatenates their AtomicTextBlocks into a single TextBlockEntity.
-     * So, for a Section all AtomicTextBlocks of Subsections, Paragraphs, and Tables are concatenated into a single TextBlockEntity
-     *
-     * @return TextBlock containing all AtomicTextBlocks that are located under this Node.
-     */
-    TextBlock buildTextBlock();
-
-
-    /**
-     * Any Node maintains its own Set of Entities.
-     * This Set contains all Entities, whose first index is located in any of the AtomicTextBlocks underneath this Node.
-     *
-     * @return Set of all Entities associated with this Node
-     */
-    Set<EntityNode> getEntities();
-
-
-    /**
-     * Returns the PageNode associated with this Node.
-     * If the node has more than one PageNode associated, it returns the PageNode with the lowest number.
-     * For example a section might span multiple pages, it then returns the page where the section starts.
-     *
-     * @return PageNode representing the first page on which the Node is located in the document
-     */
-    PageNode getPage();
-
-
-    /**
-     * Any Node except the First level of Sections, Header, Footer, and Pages have a direct Parent.
-     * For example a Paragraph has a parent Section, a Table Cell has a parent Table, etc...
-     * hasParent() may be used to check whether a parent is present.
-     *
-     * @return Node that represents the Parent or null, if no parent is present.
-     */
-    DocumentGraphNode getParent();
-
-
-    Stream<DocumentGraphNode> streamAllSubNodes();
-
-
-    /**
-     * Each AtomicTextBlock has a number assigned per page, this returns the number of the first AtomicTextBlock underneath this node
-     *
-     * @return Integer representing the number on the page
-     */
-    Integer getNumberOnPage();
-
-
-    /**
-     *
-     * @return the fist headline whent traversing the tree upwards
-     */
-    default CharSequence getHeadline() {
-        return getParent().getHeadline();
-    }
-
-
-    /**
-     * By default, a parent is always present, this needs to be overwritten for Headers, Footers, Pages, and Sections.
-     *
-     * @return boolean, indicating whether a parent is present.
-     */
-    default boolean hasParent() {
-
-        return true;
-    }
-
-
-    /**
-     * by default a Node does not have direct access to an AtomicTextBlock
-     *
-     * @return boolean, indicating if a Node has direct access to an AtomicTextBlock
-     */
-    default boolean isTerminal() {
-
-        return false;
-    }
-
-
-    /**
-     * by default a Node does not have direct access to an AtomicTextBlock, this method throws a UnsupportedOperationException if not overridden.
-     *
-     * @return AtomicTextBlock
-     */
-    default AtomicTextBlock getAtomicTextBlock() {
-
-        throw new UnsupportedOperationException("Only terminal Nodes have access to AtomicTextBlocks!");
-    }
-
-
-    /**
-     * creates an EntityNode with only initial values set, inserts it into the subgraph contained by this node and sets the inferrable fields.
-     * Throws NotFoundException and removes the entity if the provided boundary could not be found in the subgraph.
-     *
-     * @param boundary      start and end indices in String coordinates of the entity to be created
-     * @param type       type of the entity to be created
-     * @param entityType entityType of the entity to be created
-     * @return the newly created and inserted EntityNode with all fields set.
-     */
-    default EntityNode createAndAddEntity(Boundary boundary, String type, EntityType entityType) {
-
-        EntityNode entity = EntityNode.initialEntityNode(boundary, type, entityType);
-        addEntityToNodeAndSetFields(entity);
-        return entity;
-    }
-
-
-    /**
-     * searches for the first terminal Node containing the start index of the entity to be inserted.
-     * Catches NotFoundException to remove the EntityNode from the graph, then rethrows it
-     *
-     * @param entity newly created EntityNode with only initial values set
-     */
-    default void addEntityToNodeAndSetFields(EntityNode entity) {
-
-        try {
-            streamAllSubNodes().anyMatch(node -> node.addEntityAndSetFieldsIfStartIndexContained(entity));
-        } catch (NotFoundException e) {
-            entity.removeFromGraph();
-            throw new RuntimeException(e);
-        }
-    }
-
-
-    /**
-     * If this Node's AtomicTextBlock contains the start index of the entity, the entity's position is read from the AtomicTextBlock.
-     * If the position can not be fully read from the AtomicTextBlock, it recursively looks in the TextBlocks of the parents until all positions are found.
-     * Further, the function throws NotFoundException if no parent contains all positions.
-     * This occurs, when the Entity is in between Nodes that do not share a parent, e.g. main sections.
-     * Finally, the function adds the Entity to its own list of Entities and to every parents' list recursively.
-     *
-     * @param entity The entity to be added to the graph
-     * @return true, if the entity has been added successfully.
-     * false, if the entity's start index is not contained or the Node doesn't have an AtomicTextBlock
-     */
-    default boolean addEntityAndSetFieldsIfStartIndexContained(EntityNode entity) {
-
-        if (!isTerminal()) {
-            return false;
-        }
-
-        AtomicTextBlock atomicTextBlock = getAtomicTextBlock();
-        if (atomicTextBlock.containsIndex(entity.getBoundary().start())) {
-
-            entity.addContainingNode(this);
-
-            getEntities().add(entity);
-
-            addEntityToPage(entity);
-            addEntityToParents(entity);
-            setFields(entity, atomicTextBlock);
-            return true;
-        }
-
-        return false;
-    }
-
-
-    private void addEntityToPage(EntityNode entity) {
-
-        getPage().getEntities().add(entity);
-        entity.setPage(getPage());
-    }
-
-
-    private void setFields(EntityNode entity, AtomicTextBlock atomicTextBlock) {
-
-        if (atomicTextBlock.containsBoundary(entity.getBoundary())) {
-            enrichEntity(entity, atomicTextBlock);
-        } else {
-            this.setFieldsFromParents(this, entity);
-        }
-    }
-
-
-    private void addEntityToParents(EntityNode entity) {
-
-        DocumentGraphNode node = this;
-        while (node.hasParent()) {
-            node = node.getParent();
-            node.getEntities().add(entity);
-            entity.addContainingNode(node);
-        }
-    }
-
-
-    private void setFieldsFromParents(DocumentGraphNode node, EntityNode entity) {
-
-        if (node.hasParent()) {
-            DocumentGraphNode parent = node.getParent();
-            TextBlock textBlock = parent.buildTextBlock();
-            if (textBlock.containsBoundary(entity.getBoundary())) {
-                enrichEntity(entity, textBlock);
-                return;
-            } else {
-                setFieldsFromParents(parent, entity);
-            }
-        }
-        throw new NotFoundException(format("Position could not be found for Entity %s", entity.toString()));
-    }
-
-}
@@ -1,103 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.awt.geom.Rectangle2D;
-import java.nio.charset.StandardCharsets;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class EntityNode {
-
-    public static EntityNode initialEntityNode(Boundary boundary, String type, EntityType entityType) {
-
-        return EntityNode.builder().type(type).entityType(entityType).boundary(boundary).build();
-    }
-
-
-    // initial values
-    Boundary boundary;
-    String type;
-    EntityType entityType;
-
-    @Builder.Default
-    boolean redaction = false;
-    @Builder.Default
-    boolean falsePositive = false;
-    @Builder.Default
-    boolean removed = false;
-    @Builder.Default
-    boolean ignored = false;
-    @Builder.Default
-    boolean resized = false;
-    @Builder.Default
-    boolean skipRemoveEntitiesContainedInLarger = false;
-    @Builder.Default
-    boolean isDictionaryEntry = false;
-    @Builder.Default
-    Set<Engine> engines = new HashSet<>();
-    @Builder.Default
-    Set<Entity> references = new HashSet<>();
-    @Builder.Default
-    int matchedRule = -1;
-    @Builder.Default
-    String redactionReason = "";
-    @Builder.Default
-    String legalBasis = "";
-
-    // inferrable from graph
-    String value;
-    CharSequence textBefore;
-    CharSequence textAfter;
-    PageNode page;
-    List<Rectangle2D> positions;
-    @Builder.Default
-    Set<DocumentGraphNode> containingNodes = new HashSet<>();
-
-
-    public void addContainingNode(DocumentGraphNode containingNode) {
-
-        containingNodes.add(containingNode);
-    }
-
-
-    public void removeFromGraph() {
-
-        getContainingNodes().forEach(node -> node.getEntities().remove(this));
-        getPage().getEntities().remove(this);
-        setRemoved(true);
-    }
-
-
-    @Override
-    public int hashCode() {
-
-        var sb = new StringBuilder();
-        sb.append(value);
-        sb.append(boundary.start());
-        sb.append(page.getNumber());
-        positions.forEach(r -> {
-            sb.append(r.getMinX());
-            sb.append(r.getMinY());
-            sb.append(r.getWidth());
-            sb.append(r.getHeight());
-        });
-        return Hashing.murmur3_128().hashString(sb.toString(), StandardCharsets.UTF_8).hashCode();
-    }
-
-}
@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-public enum NodeType {
-    SECTION {
-        public String toString() {
-
-            return "Section";
-        }
-    },
-    PARAGRAPH {
-        public String toString() {
-
-            return "Paragraph";
-        }
-    },
-    TABLE {
-        public String toString() {
-
-            return "Table";
-        }
-    },
-    TABLE_CELL {
-        public String toString() {
-
-            return "Cell";
-        }
-    }
-}
@@ -1,85 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.ConcatenatedTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class PageNode implements DocumentGraphNode{
-
-    Integer number;
-    Integer height;
-    Integer width;
-    List<DocumentGraphNode> mainBody;
-    AtomicTextBlock header;
-    AtomicTextBlock footer;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-
-    public ConcatenatedTextBlock buildTextBlock() {
-
-        return mainBody.stream().filter(DocumentGraphNode::isTerminal).map(DocumentGraphNode::getAtomicTextBlock).collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public PageNode getPage() {
-
-        return this;
-    }
-
-
-    @Override
-    public DocumentGraphNode getParent() {
-
-        return null;
-    }
-
-
-    @Override
-    public boolean hasParent() {
-
-        return false;
-    }
-
-
-    @Override
-    public Stream<DocumentGraphNode> streamAllSubNodes() {
-
-        return mainBody.stream();
-    }
-
-
-    @Override
-    public Integer getNumberOnPage() {
-
-        return 0;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return header.getSearchText() + buildTextBlock().toString() + footer.getSearchText();
-    }
-
-}
@@ -1,70 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ParagraphNode implements DocumentGraphNode {
-
-    String tocId;
-    Integer numberOnPage;
-    Integer numberInSection;
-
-    @EqualsAndHashCode.Exclude
-    SectionNode parentSection;
-    @EqualsAndHashCode.Exclude
-    PageNode page;
-    AtomicTextBlock atomicTextBlock;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public AtomicTextBlock buildTextBlock() {
-
-        return atomicTextBlock;
-    }
-
-
-    @Override
-    public DocumentGraphNode getParent() {
-
-        return parentSection;
-    }
-
-
-    @Override
-    public boolean isTerminal() {
-
-        return true;
-    }
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + atomicTextBlock.toString();
-    }
-
-    @Override
-    public Stream<DocumentGraphNode> streamAllSubNodes() {
-
-        return Stream.of(this);
-    }
-
-}
@@ -1,108 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.ConcatenatedTextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class SectionNode implements DocumentGraphNode {
-
-    String tocId;
-    Integer numberOnPage;
-    @EqualsAndHashCode.Exclude
-    TableOfContents tableOfContents;
-    @EqualsAndHashCode.Exclude
-    DocumentGraphNode parentSection;
-
-
-    AtomicTextBlock headline;
-
-    List<SectionNode> subSections;
-    List<ParagraphNode> paragraphs;
-    List<TableNode> tables;
-    @EqualsAndHashCode.Exclude
-    List<PageNode> pages;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    Set<EntityNode> entities = new HashSet<>();
-
-
-    @Override
-    public String toString() {
-
-        return tocId + ": " + headline.toString();
-    }
-
-
-    @Override
-    public ConcatenatedTextBlock buildTextBlock() {
-
-        return streamAllSubNodes().map(DocumentGraphNode::getAtomicTextBlock).collect(new TextBlockCollector());
-    }
-
-
-    @Override
-    public DocumentGraphNode getParent() {
-
-        if (hasParent()) {
-            return parentSection;
-        } else {
-            throw new UnsupportedOperationException("This section has no parent Section!");
-        }
-    }
-
-
-    @Override
-    public Stream<DocumentGraphNode> streamAllSubNodes() {
-
-        return tableOfContents.streamSubEntriesInOrder(tocId).map(TableOfContents.Entry::node);
-    }
-
-
-    @Override
-    public boolean hasParent() {
-
-        return parentSection != null;
-    }
-
-
-    @Override
-    public boolean isTerminal() {
-
-        return true;
-    }
-
-
-    @Override
-    public AtomicTextBlock getAtomicTextBlock() {
-
-        return headline;
-    }
-
-
-    @Override
-    public PageNode getPage() {
-
-        return pages.get(0);
-    }
-
-}
@@ -1,59 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableCellNode implements DocumentGraphNode {
-
-    @EqualsAndHashCode.Exclude
-    TableNode parentTable;
-    Integer numberOnPage;
-    AtomicTextBlock atomicTextBlock;
-    PageNode page;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    List<EntityNode> entities = new LinkedList<>();
-
-
-    @Override
-    public AtomicTextBlock buildTextBlock() {
-
-        return atomicTextBlock;
-    }
-
-
-    @Override
-    public DocumentGraphNode getParent() {
-
-        return parentTable;
-    }
-
-
-    @Override
-    public boolean isTerminal() {
-
-        return true;
-    }
-
-    @Override
-    public Stream<DocumentGraphNode> streamAllSubNodes() {
-
-        return Stream.of(this);
-    }
-
-}
@@ -1,88 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.nodes;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.TextBlockCollector;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.ConcatenatedTextBlock;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class TableNode implements DocumentGraphNode {
-
-    Integer id;
-    String tocId;
-    Integer numberOfRows;
-    Integer numberOfCols;
-    Integer numberOnPage;
-    List<TableCellNode> tableHeaders;
-    List<List<TableCellNode>> tableCells;
-    TableOfContents tableOfContents;
-
-    @EqualsAndHashCode.Exclude
-    SectionNode parentSection;
-    @EqualsAndHashCode.Exclude
-    List<PageNode> pages;
-
-    @Builder.Default
-    @EqualsAndHashCode.Exclude
-    List<EntityNode> entities = new LinkedList<>();
-
-
-    private Stream<TableCellNode> streamTableCells() {
-
-        return tableCells.stream().flatMap(List::stream);
-    }
-
-
-    private Stream<TableCellNode> streamTableRow(int row) {
-
-        return tableCells.get(row).stream();
-    }
-
-
-    private Stream<TableCellNode> streamTableCol(int col) {
-
-        return tableCells.stream().map(row -> row.get(col));
-    }
-
-
-    @Override
-    public ConcatenatedTextBlock buildTextBlock() {
-
-        return streamTableCells().map(TableCellNode::getAtomicTextBlock).collect(new TextBlockCollector());
-    }
-
-    @Override
-    public Stream<DocumentGraphNode> streamAllSubNodes() {
-
-        return streamTableCells().map(Function.identity());
-    }
-
-
-    @Override
-    public DocumentGraphNode getParent() {
-
-        return parentSection;
-    }
-
-
-    @Override
-    public PageNode getPage() {
-
-        return pages.get(0);
-    }
-
-}
@@ -1,126 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.DocumentGraphNode;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class AtomicTextBlock implements TextBlock {
-
-    Long id;
-
-    //string coordinates
-    Boundary boundary;
-    String searchText;
-    List<Integer> lineBreaks;
-
-    //position coordinates
-    List<Integer> stringIdxToPositionIdx;
-    List<Rectangle2D> positions;
-
-    @EqualsAndHashCode.Exclude
-    DocumentGraphNode parent;
-
-
-    public int indexOf(String searchTerm) {
-
-        int pos = searchText.indexOf(searchTerm);
-        return pos == -1 ? -1 : pos + boundary.start();
-    }
-
-
-    public int numberOfLines() {
-
-        return lineBreaks.size();
-    }
-
-
-    @Override
-    public List<AtomicTextBlock> getAtomicTextBlocks() {
-
-        return List.of(this);
-    }
-
-
-    public int getNextLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                .filter(linebreak -> linebreak > fromIndex) //
-                .findFirst() //
-                .orElse(searchText.length()) + boundary.start();
-    }
-
-
-    public int getPreviousLinebreak(int fromIndex) {
-
-        return lineBreaks.stream()//
-                .filter(linebreak -> linebreak <= fromIndex)//
-                .reduce((a, b) -> b)//
-                .orElse(0) + boundary.start();
-    }
-
-
-    public Rectangle2D getPosition(int stringIdx) {
-
-        return positions.get(stringIdxToPositionIdx.get(stringIdx - boundary.start()));
-    }
-
-
-    public List<Rectangle2D> getPositions(Boundary boundary) {
-
-        if (!containsBoundary(boundary)) {
-            throw new IndexOutOfBoundsException(format("%s is out of bounds for %s",
-                    boundary,
-                    this.boundary));
-        }
-
-        if (boundary.end() == this.boundary.end()) {
-            return positions.subList(stringIdxToPositionIdx.get(boundary.start() - this.boundary.start()), positions.size());
-        }
-
-        return positions.subList(stringIdxToPositionIdx.get(boundary.start() - this.boundary.start()), stringIdxToPositionIdx.get(boundary.end() - this.boundary.start()));
-    }
-
-
-    @Override
-    public int length() {
-
-        return searchText.length();
-    }
-
-
-    @Override
-    public char charAt(int index) {
-
-        return searchText.charAt(index - boundary.start());
-    }
-
-
-    @Override
-    public CharSequence subSequence(int start, int end) {
-
-        return searchText.substring(start - boundary.start(), end - boundary.start());
-    }
-
-
-    @Override
-    public String toString() {
-
-        return searchText;
-    }
-
-}
@@ -1,155 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Supplier;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ConcatenatedTextBlock implements TextBlock, Supplier<ConcatenatedTextBlock> {
-
-    List<AtomicTextBlock> atomicTextBlocks;
-    StringBuilder searchText;
-    Boundary boundary;
-
-
-    public ConcatenatedTextBlock(List<AtomicTextBlock> atomicTextBlocks) {
-
-        this.atomicTextBlocks = new LinkedList<>();
-        this.searchText = new StringBuilder();
-        if (atomicTextBlocks.isEmpty()) {
-            boundary = new Boundary(-1, -1);
-            return;
-        }
-        var firstTextBlock = atomicTextBlocks.get(0);
-        this.atomicTextBlocks.add(firstTextBlock);
-        this.searchText.append(firstTextBlock.getSearchText());
-        boundary = new Boundary(firstTextBlock.getBoundary().start(), firstTextBlock.getBoundary().end());
-
-        atomicTextBlocks.subList(1, atomicTextBlocks.size()).forEach(this::concat);
-    }
-
-
-    public ConcatenatedTextBlock(AtomicTextBlock atomicTextBlocks) {
-
-        new ConcatenatedTextBlock(List.of(atomicTextBlocks));
-    }
-
-
-    public ConcatenatedTextBlock concat(TextBlock textBlock) {
-
-        if (this.atomicTextBlocks.isEmpty()) {
-            boundary.setStart(textBlock.getBoundary().start());
-            boundary.setEnd(textBlock.getBoundary().end());
-        } else if (boundary.end() != textBlock.getBoundary().start()) {
-            throw new UnsupportedOperationException(format("Can only concat consecutive TextBlocks, trying to concat %s to %s", textBlock.getBoundary(), boundary));
-        }
-        this.searchText.append(textBlock.getSearchText());
-        this.atomicTextBlocks.addAll(textBlock.getAtomicTextBlocks());
-        boundary.setEnd(textBlock.getBoundary().end());
-        return this;
-    }
-
-
-    public int indexOf(String searchTerm) {
-
-        int pos = this.searchText.indexOf(searchTerm);
-        return pos == -1 ? -1 : pos + boundary.start();
-    }
-
-
-    public int numberOfLines() {
-
-        return atomicTextBlocks.stream().map(AtomicTextBlock::getLineBreaks).mapToInt(List::size).sum();
-    }
-
-
-    public int getNextLinebreak(int fromIndex) {
-
-        return getAtomicTextBlockByStringIndex(fromIndex).getNextLinebreak(fromIndex);
-    }
-
-
-    public int getPreviousLinebreak(int fromIndex) {
-
-        return getAtomicTextBlockByStringIndex(fromIndex).getPreviousLinebreak(fromIndex);
-    }
-
-
-    public Rectangle2D getPosition(int stringIdx) {
-
-        return getAtomicTextBlockByStringIndex(stringIdx).getPosition(stringIdx);
-    }
-
-
-    public List<Rectangle2D> getPositions(Boundary boundary) {
-
-        List<AtomicTextBlock> textBlocks = getAllAtomicTextBlocksPartiallyInStringIdxRange(boundary);
-
-        if (textBlocks.size() == 1) {
-            return textBlocks.get(0).getPositions(boundary);
-        }
-
-        AtomicTextBlock firstTextBlock = textBlocks.get(0);
-        List<Rectangle2D> positions = new LinkedList<>(firstTextBlock.getPositions(new Boundary(boundary.start(), firstTextBlock.getBoundary().end())));
-
-        for (AtomicTextBlock textBlock : textBlocks.subList(1, textBlocks.size() - 1)) {
-            positions.addAll(textBlock.getPositions());
-        }
-
-        var lastTextBlock = textBlocks.get(textBlocks.size() - 1);
-        positions.addAll(lastTextBlock.getPositions(new Boundary(lastTextBlock.getBoundary().start(), boundary.end())));
-
-        return positions;
-    }
-
-
-    private AtomicTextBlock getAtomicTextBlockByStringIndex(int stringIdx) {
-
-        return atomicTextBlocks.stream().filter(textBlock -> (textBlock.getBoundary().end()) > stringIdx).findFirst().orElseThrow(IndexOutOfBoundsException::new);
-    }
-
-
-    private List<AtomicTextBlock> getAllAtomicTextBlocksPartiallyInStringIdxRange(Boundary boundary) {
-
-        return atomicTextBlocks.stream().filter(tb -> tb.getBoundary().intersects(boundary)).toList();
-    }
-
-
-    @Override
-    public int length() {
-
-        return this.searchText.length();
-    }
-
-
-    @Override
-    public char charAt(int index) {
-
-        return searchText.charAt(index - boundary.start());
-    }
-
-
-    @Override
-    public CharSequence subSequence(int start, int end) {
-
-        return searchText.subSequence(start - boundary.start(), end - boundary.start());
-    }
-
-
-    @Override
-    public ConcatenatedTextBlock get() {
-
-        return this;
-    }
-
-}
@@ -1,65 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-
-public interface TextBlock extends CharSequence {
-
-    CharSequence getSearchText();
-
-
-    List<AtomicTextBlock> getAtomicTextBlocks();
-
-
-    Boundary getBoundary();
-
-
-    int getNextLinebreak(int fromIndex);
-
-
-    int getPreviousLinebreak(int fromIndex);
-
-
-    Rectangle2D getPosition(int stringIdx);
-
-
-    List<Rectangle2D> getPositions(Boundary range);
-
-
-    int numberOfLines();
-
-
-    int indexOf(String searchTerm);
-
-
-    default CharSequence getFirstLine() {
-
-        return subSequence(getBoundary().start(), getNextLinebreak(getBoundary().start()));
-    }
-
-
-    default boolean containsBoundary(Boundary boundary) {
-
-        if (boundary.end() < boundary.start()) {
-            throw new IllegalArgumentException(format("Invalid %s, StartIndex must be smaller than EndIndex", boundary));
-        }
-        return getBoundary().contains(boundary);
-    }
-
-
-    default boolean containsIndex(int stringIndex) {
-
-        return getBoundary().contains(stringIndex);
-    }
-
-
-    default CharSequence subSequence(Boundary boundary) {
-
-        return subSequence(boundary.start(), boundary.end());
-    }
-
-}
@@ -1,51 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.graph.textblock;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-
-import lombok.NoArgsConstructor;
-
-@NoArgsConstructor
-public class TextBlockCollector implements Collector<AtomicTextBlock, ConcatenatedTextBlock, ConcatenatedTextBlock> {
-
-
-    @Override
-    public Supplier<ConcatenatedTextBlock> supplier() {
-
-        return new ConcatenatedTextBlock(Collections.emptyList());
-    }
-
-
-    @Override
-    public BiConsumer<ConcatenatedTextBlock, AtomicTextBlock> accumulator() {
-
-        return ConcatenatedTextBlock::concat;
-    }
-
-
-    @Override
-    public BinaryOperator<ConcatenatedTextBlock> combiner() {
-
-        return ConcatenatedTextBlock::concat;
-    }
-
-
-    @Override
-    public Function<ConcatenatedTextBlock, ConcatenatedTextBlock> finisher() {
-
-        return Function.identity();
-    }
-
-
-    @Override
-    public Set<Characteristics> characteristics() {
-
-        return Set.of(Characteristics.IDENTITY_FINISH, Characteristics.CONCURRENT);
-    }
-
-}
@@ -1,98 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.document.data.AtomicTextBlockData;
-import com.iqser.red.service.redaction.v1.server.document.data.DocumentData;
-import com.iqser.red.service.redaction.v1.server.document.data.PageData;
-import com.iqser.red.service.redaction.v1.server.document.data.TableOfContentsData;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-
-@Service
-public class DocumentDataMapper {
-
-    public DocumentData toDocumentData(DocumentGraph documentGraph) {
-
-        List<AtomicTextBlockData> atomicTextBlockData = documentGraph.streamAtomicTextBlocksInOrder().map(this::toAtomicTextBlockData).toList();
-        List<PageData> pageData = documentGraph.getPages().stream().map(this::toPageData).toList();
-        TableOfContentsData tableOfContentsData = toTableOfContentsData(documentGraph.getTableOfContents());
-        return DocumentData.builder().atomicTextBlocks(atomicTextBlockData).pages(pageData).tableOfContents(tableOfContentsData).build();
-    }
-
-
-    private TableOfContentsData toTableOfContentsData(TableOfContents tableOfContents) {
-
-        return new TableOfContentsData(tableOfContents.getEntries().stream().map(this::toEntryData).toList());
-    }
-
-
-    private TableOfContentsData.EntryData toEntryData(TableOfContents.Entry entry) {
-
-        return TableOfContentsData.EntryData.builder()
-                .tocId(entry.id())
-                .subEntries(entry.children().stream().map(this::toEntryData).toList())
-                .type(entry.type())
-                .atomicTextBlock(entry.node().isTerminal() ? entry.node().getAtomicTextBlock().getId() : -1L)
-                .page(Long.valueOf(entry.node().getPage().getNumber()))
-                .numberOnPage(entry.node().getNumberOnPage())
-                .build();
-    }
-
-
-    private PageData toPageData(PageNode pageNode) {
-
-        return PageData.builder()
-                .height(pageNode.getHeight())
-                .width(pageNode.getWidth())
-                .number(pageNode.getNumber())
-                .footer(pageNode.getFooter().getId())
-                .header(pageNode.getHeader().getId())
-                .build();
-    }
-
-
-    private AtomicTextBlockData toAtomicTextBlockData(AtomicTextBlock atomicTextBlock) {
-
-        return AtomicTextBlockData.builder()
-                .id(atomicTextBlock.getId())
-                .searchText(atomicTextBlock.getSearchText())
-                .start(atomicTextBlock.getBoundary().start())
-                .end(atomicTextBlock.getBoundary().end())
-                .lineBreaks(toPrimitiveIntArray(atomicTextBlock.getLineBreaks()))
-                .stringIdxToPositionIdx(toPrimitiveIntArray(atomicTextBlock.getStringIdxToPositionIdx()))
-                .positions(toPrimitiveFloatMatrix(atomicTextBlock.getPositions()))
-                .build();
-    }
-
-
-    private float[][] toPrimitiveFloatMatrix(List<Rectangle2D> positions) {
-
-        float[][] positionMatrix = new float[positions.size()][];
-        for (int i = 0; i < positions.size(); i++) {
-            float[] singlePositions = new float[4];
-            singlePositions[0] = (float) positions.get(i).getMinX();
-            singlePositions[1] = (float) positions.get(i).getMinY();
-            singlePositions[2] = (float) positions.get(i).getWidth();
-            singlePositions[3] = (float) positions.get(i).getHeight();
-            positionMatrix[i] = singlePositions;
-        }
-        return positionMatrix;
-    }
-
-
-    private int[] toPrimitiveIntArray(List<Integer> list) {
-
-        int[] array = new int[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            array[i] = list.get(i);
-        }
-        return array;
-    }
-
-}
@@ -1,304 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.document.services;
-
-import static java.lang.String.format;
-
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.classification.model.Section;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.document.graph.Boundary;
-import com.iqser.red.service.redaction.v1.server.document.graph.DocumentGraph;
-import com.iqser.red.service.redaction.v1.server.document.graph.TableOfContents;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.DocumentGraphNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.NodeType;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.PageNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.ParagraphNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.SectionNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.nodes.TableNode;
-import com.iqser.red.service.redaction.v1.server.document.graph.textblock.AtomicTextBlock;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchTextWithTextPositionModel;
-import com.iqser.red.service.redaction.v1.server.redaction.service.SearchTextWithTextPositionFactory;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class DocumentGraphFactory {
-
-    private final SearchTextWithTextPositionFactory searchTextWithTextPositionFactory;
-
-
-    public DocumentGraph buildDocumentGraph(Document document) {
-
-        Context context = new Context(new TableOfContents(), new LinkedList<>(), new LinkedList<>(), new AtomicInteger(0), new AtomicLong(0));
-
-        context.pages.addAll(document.getPages().stream().map(this::buildPage).toList());
-
-        // is tracked by Table of Contents
-        addSections(document, context);
-
-        // not tracked by Table of Contents
-        addHeaderAndFooterToEachPage(document, context);
-        DocumentGraph documentGraph = DocumentGraph.builder()
-                .numberOfPages(context.pages.size())
-                .pages(context.pages)
-                .sections(context.sections)
-                .tableOfContents(context.tableOfContents)
-                .build();
-        documentGraph.setText(documentGraph.buildTextBlock());
-        return documentGraph;
-    }
-
-
-    private void addSections(Document document, Context context) {
-
-        for (var section : document.getSections()) {
-            addSection(section, context);
-        }
-    }
-
-
-    private void addSection(Section section, Context context) {
-
-        SectionNode sectionEntity = SectionNode.builder()
-                .entities(new LinkedList<>())
-                .pages(new LinkedList<>())
-                .paragraphs(new LinkedList<>())
-                .tables(new LinkedList<>())
-                .subSections(new LinkedList<>())
-                .tableOfContents(context.tableOfContents())
-                .build();
-
-        context.sections().add(sectionEntity);
-        List<AbstractTextContainer> pageBlocks = new ArrayList<>(section.getPageBlocks());
-        PageNode page = getPage(section.getPageBlocks().get(0).getPage(), context);
-        sectionEntity.getPages().add(page);
-        page.getMainBody().add(sectionEntity);
-        if (pageBlocks.get(0) instanceof TextBlock) {
-            sectionEntity.setHeadline(buildAtomicTextBlock(((TextBlock) pageBlocks.get(0)).getSequences(), sectionEntity, context));
-            sectionEntity.setNumberOnPage(((TextBlock) pageBlocks.get(0)).getIndexOnPage());
-            pageBlocks.remove(0);
-        } else {
-            sectionEntity.setNumberOnPage(1);
-            sectionEntity.setHeadline(emptyTextBlock(sectionEntity, context));
-        }
-
-        String sectionId = context.tableOfContents.createNewEntryAndReturnId(NodeType.SECTION, buildSummary(sectionEntity.getHeadline()), sectionEntity);
-        sectionEntity.setTocId(sectionId);
-
-        int paragraphIdx = 0;
-        int tableIdx = 0;
-        for (AbstractTextContainer abstractTextContainer : pageBlocks) {
-            if (abstractTextContainer instanceof TextBlock) {
-                addParagraph(sectionEntity, (TextBlock) abstractTextContainer, paragraphIdx, context);
-                paragraphIdx++;
-            } else if (abstractTextContainer instanceof Table) {
-                //addTable(sectionEntity, (Table) abstractTextContainer, tableIdx, context);
-                tableIdx++;
-
-            }
-        }
-    }
-
-
-    private void addTable(SectionNode sectionEntity, Table table, int tableIdx, Context context) {
-
-        PageNode page = getPage(table.getPage(), context);
-        TableNode tableEntity = TableNode.builder().id(tableIdx).tableOfContents(context.tableOfContents()).pages(new LinkedList<>()).parentSection(sectionEntity).build();
-        sectionEntity.getTables().add(tableEntity);
-
-        if (!page.getMainBody().contains(sectionEntity)) {
-            sectionEntity.getPages().add(page);
-        }
-        page.getMainBody().add(tableEntity);
-
-    }
-
-
-    private void addParagraph(SectionNode sectionEntity, TextBlock originalTextBlock, int paragraphIdx, Context context) {
-
-        PageNode page = getPage(originalTextBlock.getPage(), context);
-        ParagraphNode paragraph = ParagraphNode.builder().numberOnPage(originalTextBlock.getIndexOnPage()).page(page).parentSection(sectionEntity).build();
-        sectionEntity.getParagraphs().add(paragraph);
-
-        if (!page.getMainBody().contains(sectionEntity)) {
-            sectionEntity.getPages().add(page);
-        }
-        page.getMainBody().add(paragraph);
-
-        var textBlock = buildAtomicTextBlock(originalTextBlock.getSequences(), paragraph, context);
-        paragraph.setAtomicTextBlock(textBlock);
-
-        String tocId = context.tableOfContents.createNewChildEntryAndReturnId(sectionEntity.getTocId(), NodeType.PARAGRAPH, buildSummary(textBlock), paragraph);
-        paragraph.setTocId(tocId);
-    }
-
-
-    private void addHeaderAndFooterToEachPage(Document document, Context context) {
-
-        Map<Integer, List<TextBlock>> headers = document.getHeaders()
-                .stream()
-                .map(Header::getTextBlocks)
-                .flatMap(List::stream)
-                .collect(Collectors.groupingBy(AbstractTextContainer::getPage, Collectors.toList()));
-
-        Map<Integer, List<TextBlock>> footers = document.getFooters()
-                .stream()
-                .map(Footer::getTextBlocks)
-                .flatMap(List::stream)
-                .collect(Collectors.groupingBy(AbstractTextContainer::getPage, Collectors.toList()));
-
-        for (int pageIndex = 1; pageIndex <= document.getPages().size(); pageIndex++) {
-            if (headers.containsKey(pageIndex)) {
-                addHeader(headers.get(pageIndex), context);
-            } else {
-                addEmptyHeader(pageIndex, context);
-            }
-        }
-
-        for (int pageIndex = 1; pageIndex <= document.getPages().size(); pageIndex++) {
-            if (footers.containsKey(pageIndex)) {
-                addFooter(footers.get(pageIndex), context);
-            } else {
-                addEmptyFooter(pageIndex, context);
-            }
-        }
-    }
-
-
-    private void addFooter(List<TextBlock> textBlocks, Context context) {
-
-        PageNode page = getPage(textBlocks.get(0).getPage(), context);
-        AtomicTextBlock footer = buildAtomicTextBlock(mergeAndSortTextPositionSequences(textBlocks), page, context);
-        page.setFooter(footer);
-    }
-
-
-    public void addHeader(List<TextBlock> textBlocks, Context context) {
-
-        PageNode page = getPage(textBlocks.get(0).getPage(), context);
-        AtomicTextBlock header = buildAtomicTextBlock(mergeAndSortTextPositionSequences(textBlocks), page, context);
-        page.setHeader(header);
-    }
-
-
-    private void addEmptyFooter(int pageIndex, Context context) {
-
-        PageNode page = getPage(pageIndex, context);
-        page.setFooter(emptyTextBlock(page, context));
-    }
-
-
-    private void addEmptyHeader(int pageIndex, Context context) {
-
-        PageNode page = getPage(pageIndex, context);
-        page.setHeader(emptyTextBlock(page, context));
-    }
-
-
-    private AtomicTextBlock emptyTextBlock(DocumentGraphNode parent, Context context) {
-
-        return AtomicTextBlock.builder()
-                .id(context.textBlockIdx.getAndIncrement())
-                .boundary(new Boundary(context.stringOffset.get(), context.stringOffset.get()))
-                .searchText("")
-                .lineBreaks(Collections.emptyList())
-                .stringIdxToPositionIdx(Collections.emptyList())
-                .positions(Collections.emptyList())
-                .parent(parent)
-                .build();
-    }
-
-
-    private static String buildSummary(AtomicTextBlock textBlock) {
-
-        if (textBlock == null) {
-            return " probably a table";
-        }
-
-        String[] words = textBlock.getFirstLine().toString().split(" ");
-        int bound = Math.min(words.length, 4);
-        List<String> list = new ArrayList<>(Arrays.asList(words).subList(0, bound));
-
-        return String.join(" ", list);
-    }
-
-
-    private PageNode buildPage(Page p) {
-
-        return PageNode.builder().height((int) p.getPageHeight()).width((int) p.getPageWidth()).number(p.getPageNumber()).mainBody(new LinkedList<>()).build();
-    }
-
-
-    private List<TextPositionSequence> mergeAndSortTextPositionSequences(List<TextBlock> textBlocks) {
-
-        Comparator<TextPositionSequence> sortByX = (sequence1, sequence2) -> (int) (sequence1.getTextPositions().get(0).getPosition()[0] - sequence2.getTextPositions()
-                .get(0)
-                .getPosition()[0]);
-        Comparator<TextPositionSequence> sortByY = (sequence1, sequence2) -> (int) (sequence1.getTextPositions().get(0).getPosition()[1] - sequence2.getTextPositions()
-                .get(0)
-                .getPosition()[1]);
-
-        return textBlocks.stream().map(TextBlock::getSequences).flatMap(List::stream).sorted(sortByX.thenComparing(sortByY)).toList();
-    }
-
-
-    private AtomicTextBlock buildAtomicTextBlock(List<TextPositionSequence> sequences, DocumentGraphNode parent, Context context) {
-
-        SearchTextWithTextPositionModel searchTextWithTextPositionModel = searchTextWithTextPositionFactory.buildSearchTextToTextPositionModel(sequences);
-        int offset = context.stringOffset().getAndAdd(searchTextWithTextPositionModel.getSearchText().length());
-
-        return AtomicTextBlock.builder()
-                .id(context.textBlockIdx.getAndIncrement())
-                .parent(parent)
-                .searchText(searchTextWithTextPositionModel.getSearchText())
-                .lineBreaks(searchTextWithTextPositionModel.getLineBreaks())
-                .positions(toRectangle2D(searchTextWithTextPositionModel.getPositions()))
-                .stringIdxToPositionIdx(searchTextWithTextPositionModel.getStringCoordsToPositionCoords())
-                .boundary(new Boundary(offset, offset + searchTextWithTextPositionModel.getSearchText().length()))
-                .build();
-    }
-
-
-    private List<Rectangle2D> toRectangle2D(List<RedRectangle2D> positions) {
-
-        return positions.stream().map(r -> (Rectangle2D) new Rectangle2D.Double(r.getX(), r.getY(), r.getWidth(), r.getHeight())).toList();
-    }
-
-
-    private PageNode getPage(int pageIndex, Context context) {
-
-        return context.pages.stream()
-                .filter(page -> page.getNumber() == pageIndex)
-                .findFirst()
-                .orElseThrow(() -> new NotFoundException(format("Page with number %d not found", pageIndex)));
-    }
-
-
-    record Context(
-            TableOfContents tableOfContents, List<PageNode> pages, List<SectionNode> sections, AtomicInteger stringOffset, AtomicLong textBlockIdx) {
-
-    }
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lmaldacker	0b30da89bc	Fix pmd	2021-02-09 16:19:04 +01:00
lmaldacker	97abac1add	Add missing var	2021-02-09 14:58:27 +01:00
lmaldacker	3f3256469c	Add more logs	2021-02-09 14:06:27 +01:00
lmaldacker	9ceba4abf3	Adjust imports	2021-02-09 10:36:58 +01:00
lmaldacker	ebca1fc750	Adjust pom	2021-02-09 10:21:34 +01:00
lmaldacker	37125f14fd	Add logs	2021-02-08 16:22:26 +01:00