Test old pattern

.gitignore

@@ -9,49 +9,6 @@
 **/tmp/
 **/.apt_generated/
 
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### maven build ###
-*.class
-/out/
-/build/
-/target/
-**/out/
-**/build/
-**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-.gradle
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
 
 .factorypath
 .springBeans
@@ -69,7 +26,3 @@ build/
 **/.DS_Store
 **/classpath-data.json
 **/dependencies-and-licenses-overview.txt
-gradle.properties
-gradlew
-gradlew.bat
-gradle/

.gitlab-ci.yml

@@ -1,23 +0,0 @@
-variables:
-  SONAR_PROJECT_KEY: 'RED_redaction-service'
-include:
-  - project: 'gitlab/gitlab'
-    ref: 'main'
-    file: 'ci-templates/gradle_java.yml'
-
-deploy:
-  stage: deploy
-  tags:
-    - dind
-  script:
-    - echo "Building with gradle version ${BUILDVERSION}"
-    - gradle -Pversion=${BUILDVERSION} publish
-    - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
-    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
-  artifacts:
-    reports:
-      dotenv: version.env
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH =~ /^release/
-    - if: $CI_COMMIT_TAG

CHANGELOG.md

@@ -1,5 +1,4 @@
 # Changelog
-
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]

bamboo-specs/pom.xml

@@ -0,0 +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>
+
+  <parent>
+    <groupId>com.atlassian.bamboo</groupId>
+    <artifactId>bamboo-specs-parent</artifactId>
+    <version>7.2.2</version>
+    <relativePath/>
+  </parent>
+
+  <artifactId>bamboo-specs</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.atlassian.bamboo</groupId>
+      <artifactId>bamboo-specs-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.atlassian.bamboo</groupId>
+      <artifactId>bamboo-specs</artifactId>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+
+  <!-- run 'mvn test' to perform offline validation of the plan -->
+  <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
+</project>

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -0,0 +1,128 @@
+package buildjob;
+
+import com.atlassian.bamboo.specs.api.BambooSpec;
+import com.atlassian.bamboo.specs.api.builders.BambooKey;
+import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
+import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
+import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
+import com.atlassian.bamboo.specs.api.builders.permission.PlanPermissions;
+import com.atlassian.bamboo.specs.api.builders.plan.Job;
+import com.atlassian.bamboo.specs.api.builders.plan.Plan;
+import com.atlassian.bamboo.specs.api.builders.plan.PlanIdentifier;
+import com.atlassian.bamboo.specs.api.builders.plan.Stage;
+import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
+import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
+import com.atlassian.bamboo.specs.api.builders.project.Project;
+import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
+import com.atlassian.bamboo.specs.builders.task.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.model.task.InjectVariablesScope;
+import com.atlassian.bamboo.specs.util.BambooServer;
+import com.atlassian.bamboo.specs.builders.task.ScriptTask;
+import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
+
+import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
+
+/**
+ * Plan configuration for Bamboo.
+ * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
+ */
+@BambooSpec
+public class PlanSpec {
+
+    private static final String SERVICE_NAME = "redaction-service";
+
+    private static final String JVM_ARGS =" -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
+
+    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
+
+    /**
+     * Run main to publish plan on Bamboo
+     */
+    public static void main(final String[] args) throws Exception {
+        //By default credentials are read from the '.credentials' file.
+        BambooServer bambooServer = new BambooServer("http://localhost:8085");
+
+        Plan plan = new PlanSpec().createPlan();
+        bambooServer.publish(plan);
+        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
+        bambooServer.publish(planPermission);
+    }
+
+    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
+        Permissions permission = new Permissions()
+                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .loggedInUserPermissions(PermissionType.VIEW)
+                .anonymousUserPermissionView();
+        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
+    }
+
+    private Project project() {
+        return new Project()
+                .name("RED")
+                .key(new BambooKey("RED"));
+    }
+
+    public Plan createPlan() {
+        return new Plan(
+                project(),
+                SERVICE_NAME, new BambooKey(SERVICE_KEY))
+                .description("Plan created from (enter repository url of your plan)")
+                .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("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 ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME),
+                                        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))
+                        .notificationForCommitters());
+    }
+}

bamboo-specs/src/main/resources/scripts/build-java.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+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/./urandomelse
+else        
+    ${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}
+    ${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}
+    ${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
+
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+    package
+
+${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
+
+if [[ "${bamboo_version_tag}" = "dev" ]]
+then 
+    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
+else
+    echo "gitTag=${bamboo_version_tag}" > git.tag
+fi

bamboo-specs/src/main/resources/scripts/sonar-java.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+echo "dependency-check:aggregate"
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/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

bamboo-specs/src/test/java/buildjob/PlanSpecTest.java

@@ -0,0 +1,17 @@
+package buildjob;
+
+
+import org.junit.Test;
+
+import com.atlassian.bamboo.specs.api.builders.plan.Plan;
+import com.atlassian.bamboo.specs.api.exceptions.PropertiesValidationException;
+import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
+
+public class PlanSpecTest {
+    @Test
+    public void checkYourPlanOffline() throws PropertiesValidationException {
+        Plan plan = new PlanSpec().createPlan();
+
+        EntityPropertiesBuilders.build(plan);
+    }
+}

buildSrc/build.gradle.kts

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

buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts

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

config/checkstyle/checkstyle.xml

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

config/pmd/pmd.xml

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

config/pmd/test_pmd.xml

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

gradle.properties.kts

@@ -1 +0,0 @@
-version = 4.0-SNAPSHOT

pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>redaction-service</artifactId>
+    <groupId>com.iqser.red.service</groupId>
+    <version>1.0-SNAPSHOT</version>
+
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>bamboo-specs</module>
+        <module>redaction-service-v1</module>
+        <module>redaction-service-image-v1</module>
+    </modules>
+
+</project>

publish-custom-image.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-dir=${PWD##*/}
-gradle assemble
-
-# Get the current Git branch
-branch=$(git rev-parse --abbrev-ref HEAD)
-
-# Get the short commit hash (first 5 characters)
-commit_hash=$(git rev-parse --short=5 HEAD)
-
-# Combine branch and commit hash
-buildName="${USER}-${branch}-${commit_hash}"
-
-gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=$buildName
-echo "nexus.knecon.com:5001/red/${dir}-server-v1:$buildName"

redaction-service-image-v1/pom.xml

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

redaction-service-image-v1/src/main/docker/Dockerfile

@@ -0,0 +1,18 @@
+FROM red/base-image:1.0.0
+
+ARG PLATFORM_JAR
+
+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.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \

redaction-service-v1/pom.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>platform-dependency</artifactId>
+        <groupId>com.iqser.red</groupId>
+        <version>1.1.5</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>redaction-service-v1</artifactId>
+    <groupId>com.iqser.red.service</groupId>
+    <version>1.0-SNAPSHOT</version>
+
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>redaction-service-api-v1</module>
+        <module>redaction-service-server-v1</module>
+    </modules>
+
+    <properties>
+        <pdfbox.version>2.0.24</pdfbox.version>
+    </properties>
+
+
+    <dependencyManagement>
+
+        <dependencies>
+            <dependency>
+                <groupId>com.iqser.red</groupId>
+                <artifactId>platform-commons-dependency</artifactId>
+                <version>1.7.0</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox</artifactId>
+                <version>${pdfbox.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox-tools</artifactId>
+                <version>${pdfbox.version}</version>
+            </dependency>
+
+        </dependencies>
+
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.9.0.2155</version>
+                    </plugin>                    
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>6.3.1</version>
+                    <configuration>
+                        <format>ALL</format>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <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>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

redaction-service-v1/redaction-service-api-v1/build.gradle.kts

@@ -1,28 +0,0 @@
-plugins {
-    id("com.iqser.red.service.java-conventions")
-    id("io.freefair.lombok") version "8.4"
-}
-
-description = "redaction-service-api-v1"
-
-dependencies {
-    implementation("org.springframework:spring-web:6.0.12")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.207.0")
-}
-
-publishing {
-    publications {
-        create<MavenPublication>(name) {
-            from(components["java"])
-        }
-    }
-    repositories {
-        maven {
-            url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
-            credentials {
-                username = providers.gradleProperty("mavenUser").getOrNull();
-                password = providers.gradleProperty("mavenPassword").getOrNull();
-            }
-        }
-    }
-}

redaction-service-v1/redaction-service-api-v1/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>redaction-service-v1</artifactId>
+        <groupId>com.iqser.red.service</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>redaction-service-api-v1</artifactId>
+
+    <dependencies>
+        <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>0.44.0</version>
+        </dependency>
+    </dependencies>
+</project>

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeRequest.java

@@ -0,0 +1,38 @@
+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 String dossierId;
+    private String fileId;
+    private String dossierTemplateId;
+    private boolean reanalyseOnlyIfPossible;
+    private ManualRedactions manualRedactions;
+    private OffsetDateTime lastProcessed;
+
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();
+
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();
+
+}
+

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java

@@ -0,0 +1,30 @@
+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 AnalyzeResult {
+
+    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;
+
+
+}
+

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnnotateRequest.java

@@ -1,20 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
 
 @Data
 @Builder
-@AllArgsConstructor
 @NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class DroolsSyntaxErrorMessage {
+@AllArgsConstructor
+public class AnnotateRequest {
 
-    Integer line;
-    Integer column;
-    String message;
+    private String dossierId;
+    private String dossierTemplateId;
+    private String fileId;
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnnotateResponse.java

@@ -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;
-
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ArgumentType.java

@@ -2,14 +2,6 @@ package com.iqser.red.service.redaction.v1.model;
 
 public enum ArgumentType {
 
-    INTEGER,
-    BOOLEAN,
-    STRING,
-    FILE_ATTRIBUTE,
-    REGEX,
-    TYPE,
-    RULE_NUMBER,
-    LEGAL_BASIS,
-    REFERENCE_TYPE
+    INTEGER, BOOLEAN, STRING, FILE_ATTRIBUTE, REGEX, TYPE, RULE_NUMBER, LEGAL_BASIS, REFERENCE_TYPE
 
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/CellRectangle.java

@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CellRectangle {
+
+    private Point topLeft;
+    private float width;
+    private float height;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Change.java

@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Change {
+
+    private ChangeType type;
+    private OffsetDateTime dateTime;
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ChangeType.java

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ChangeType {
+    ADDED, REMOVED, CHANGED
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/DroolsSyntaxValidation.java

@@ -1,34 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class DroolsSyntaxValidation {
-
-    @Builder.Default
-    List<DroolsSyntaxErrorMessage> droolsSyntaxErrorMessages = new LinkedList<>();
-
-
-    public void addErrorMessage(int line, int column, String message) {
-
-        getDroolsSyntaxErrorMessages().add(DroolsSyntaxErrorMessage.builder().line(line).column(column).message(message).build());
-    }
-
-    public boolean isCompiled() {
-
-        return droolsSyntaxErrorMessages.isEmpty();
-    }
-
-}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Engine.java

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

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/FileAttribute.java

@@ -0,0 +1,19 @@
+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 FileAttribute {
+
+    private String id;
+    private String label;
+    private String placeholder;
+    private String value;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionType.java

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ManualRedactionType {
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Point.java

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Point {
+
+    private float x;
+    private float y;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ReanalyzeResult.java

@@ -0,0 +1,15 @@
+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 ReanalyzeResult {
+
+    private RedactionLog redactionLog;
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Rectangle.java

@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Rectangle {
+
+    private Point topLeft;
+    private float width;
+    private float height;
+
+    private int page;
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLog.java

@@ -0,0 +1,29 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+@AllArgsConstructor
+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;
+
+    private List<RedactionLogEntry> redactionLogEntry;
+    private List<LegalBasis> legalBasis;
+
+    private long dictionaryVersion = -1;
+    private long dossierDictionaryVersion = -1;
+    private long rulesVersion = -1;
+    private long legalBasisVersion = -1;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogChanges.java

@@ -0,0 +1,17 @@
+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;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionLogEntry.java

@@ -0,0 +1,74 @@
+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.Comment;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode
+public class RedactionLogEntry {
+
+    private String id;
+    private String type;
+    private String value;
+    private String reason;
+    private int matchedRule;
+    private String legalBasis;
+    private boolean redacted;
+    private boolean isHint;
+    private boolean isRecommendation;
+    private String section;
+    private float[] color;
+
+    @Builder.Default
+    private List<Rectangle> positions = new ArrayList<>();
+    private int sectionNumber;
+    private boolean manual;
+    private AnnotationStatus status;
+    private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
+    private boolean isDictionaryEntry;
+
+    private String textBefore;
+    private String textAfter;
+
+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
+    private int startOffset;
+    private int endOffset;
+
+    private boolean isImage;
+    private boolean imageHasTransparency;
+
+    private boolean isDossierDictionaryEntry;
+
+    private boolean excluded;
+
+    private String recategorizationType;
+    private String legalBasisChangeValue;
+
+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<Change> changes = new ArrayList<>();
+
+    private Set<Engine> engines= new HashSet<>();
+
+    private Set<String> reference = new HashSet<>();
+
+
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionRequest.java

@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashSet;
+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;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedactionRequest {
+
+    private String dossierId;
+    private String fileId;
+    private String dossierTemplateId;
+    private ManualRedactions manualRedactions;
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RedactionResult.java

@@ -0,0 +1,17 @@
+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 RedactionResult {
+
+    private byte[] document;
+    private int numberOfPages;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/RuleValidationModel.java

@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class RuleValidationModel {
-
-    String ruleFileType;
-    String rulesString;
-
-}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/SectionArea.java

@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionArea {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    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();
+    }
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/SectionGrid.java

@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SectionGrid {
+
+    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/SectionRectangle.java

@@ -0,0 +1,34 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@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;
+
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -1,15 +1,29 @@
 package com.iqser.red.service.redaction.v1.resources;
 
+import com.iqser.red.service.redaction.v1.model.*;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
-import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
-
 public interface RedactionResource {
 
+    @PostMapping(value = "/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/test", consumes = MediaType.APPLICATION_JSON_VALUE)
-    DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel);
+    void testRules(@RequestBody String rules);
+
+    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
 
 }

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RuleBuilderResource.java

@@ -1,7 +1,6 @@
 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;
 

redaction-service-v1/redaction-service-server-v1/build.gradle.kts

@@ -1,95 +0,0 @@
-import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
-
-plugins {
-    application
-    id("com.iqser.red.service.java-conventions")
-    id("org.springframework.boot") version "3.1.4"
-    id("io.spring.dependency-management") version "1.1.3"
-    id("org.sonarqube") version "4.4.1.3373"
-    id("io.freefair.lombok") version "8.4"
-}
-
-description = "redaction-service-server-v1"
-
-
-val layoutParserVersion = "0.74.0"
-val jacksonVersion = "2.15.2"
-val droolsVersion = "9.44.0.Final"
-val pdfBoxVersion = "3.0.0"
-val persistenceServiceVersion = "2.210.0"
-
-configurations {
-    all {
-        exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging")
-    }
-}
-
-dependencies {
-
-    implementation(project(":redaction-service-api-v1")) { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") }
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:${persistenceServiceVersion}") { exclude(group = "org.springframework.boot") }
-    implementation("com.knecon.fforesight:layoutparser-service-internal-api:${layoutParserVersion}")
-
-    implementation("com.iqser.red.commons:spring-commons:6.2.0")
-    implementation("com.iqser.red.commons:metric-commons:2.3.0")
-
-    implementation("com.iqser.red.commons:dictionary-merge-commons:1.5.0")
-    implementation("com.iqser.red.commons:storage-commons:2.45.0")
-    implementation("com.knecon.fforesight:tenant-commons:0.14.0")
-
-    implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
-    implementation("org.ahocorasick:ahocorasick:0.6.3")
-    implementation("org.javassist:javassist:3.29.2-GA")
-
-    implementation("org.drools:drools-engine:${droolsVersion}")
-    implementation("org.drools:drools-mvel:${droolsVersion}")
-    implementation("org.kie:kie-spring:7.74.1.Final")
-
-    implementation("org.locationtech.jts:jts-core:1.19.0")
-
-    implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.0.4")
-    implementation("org.springframework.boot:spring-boot-starter-amqp:3.1.4")
-
-    testImplementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}")
-    testImplementation("org.apache.pdfbox:pdfbox-tools:${pdfBoxVersion}")
-
-    testImplementation("org.springframework.boot:spring-boot-starter-test:3.1.4")
-    testImplementation("com.knecon.fforesight:layoutparser-service-processor:${layoutParserVersion}") {
-        exclude(
-            group = "com.iqser.red.service",
-            module = "persistence-service-shared-api-v1"
-        )
-    }
-}
-
-tasks.test {
-    configure<JacocoTaskExtension> {
-        excludes = listOf("org/drools/**/*")
-    }
-}
-
-
-tasks.named<BootBuildImage>("bootBuildImage") {
-
-    environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
-    environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
-
-    imageName.set("nexus.knecon.com:5001/red/${project.name}:${project.version}")
-    if (project.hasProperty("buildbootDockerHostNetwork")) {
-        network.set("host")
-    }
-    docker {
-        if (project.hasProperty("buildbootDockerHostNetwork")) {
-            bindHostToBuilder.set(true)
-        }
-        verboseLogging.set(true)
-
-        publishRegistry {
-            username.set(providers.gradleProperty("mavenUser").getOrNull())
-            password.set(providers.gradleProperty("mavenPassword").getOrNull())
-            email.set(providers.gradleProperty("mavenEmail").getOrNull())
-            url.set("https://nexus.knecon.com:5001/")
-        }
-    }
-}

redaction-service-v1/redaction-service-server-v1/pom.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>redaction-service-v1</artifactId>
+        <groupId>com.iqser.red.service</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>redaction-service-server-v1</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>storage-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>redaction-service-api-v1</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-core</artifactId>
+            <version>7.59.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-spring</artifactId>
+            <version>7.59.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.16.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>jbig2-imageio</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-core</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-jpeg2000</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+        <!-- commons -->
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>spring-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>logging-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>metric-commons</artifactId>
+        </dependency>
+        <!-- other external -->
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox-tools</artifactId>
+        </dependency>
+        <!-- spring -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>test-commons</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <!-- generate git.properties for exposure in /info -->
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <configuration>
+                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                            <gitDescribe>
+                                <tags>true</tags>
+                            </gitDescribe>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>original-jar</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>original</classifier>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <!-- repackages the generated jar into a runnable fat-jar and makes it
+                    executable -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <executable>true</executable>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java

@@ -1,47 +1,26 @@
 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.security.servlet.ManagementWebSecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
-import com.iqser.red.service.dictionarymerge.commons.DictionaryMergeService;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
-
-import io.micrometer.core.aop.TimedAspect;
-import io.micrometer.core.instrument.MeterRegistry;
-
-@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
-@Import({MetricsConfiguration.class, StorageAutoConfiguration.class})
+@Import({DefaultWebMvcConfiguration.class})
 @EnableFeignClients(basePackageClasses = RulesClient.class)
 @EnableConfigurationProperties(RedactionServiceSettings.class)
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.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);
-    }
-
-    @Bean
-    public DictionaryMergeService dictionaryMergeService() {
-
-        return new DictionaryMergeService();
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/MetricsConfiguration.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Document.java

@@ -0,0 +1,31 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class Document {
+
+    private List<Page> pages = new ArrayList<>();
+    private List<Paragraph> paragraphs = new ArrayList<>();
+    private List<Header> headers = new ArrayList<>();
+    private List<Footer> footers = new ArrayList<>();
+    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
+    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
+    private boolean headlines;
+
+    private SectionGrid sectionGrid = new SectionGrid();
+    private DictionaryVersion dictionaryVersion;
+    private long rulesVersion;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/FloatFrequencyCounter.java

@@ -0,0 +1,73 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class FloatFrequencyCounter {
+
+    @Getter
+    Map<Float, Integer> countPerValue = new HashMap<>();
+
+    public void add(float value) {
+        if (!countPerValue.containsKey(value)) {
+            countPerValue.put(value, 1);
+        } else {
+            countPerValue.put(value, countPerValue.get(value) + 1);
+        }
+    }
+
+    public void addAll(Map<Float, Integer> otherCounter) {
+        for (Map.Entry<Float, Integer> entry : otherCounter.entrySet()) {
+            if (countPerValue.containsKey(entry.getKey())) {
+                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
+            } else {
+                countPerValue.put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    public Float getMostPopular() {
+        Map.Entry<Float, Integer> mostPopular = null;
+        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null) {
+                mostPopular = entry;
+            } else if (entry.getValue() >= mostPopular.getValue()) {
+                mostPopular = entry;
+            }
+        }
+        return mostPopular != null ? mostPopular.getKey() : null;
+    }
+
+
+    public List<Float> getHighterThanMostPopular() {
+        Float mostPopular = getMostPopular();
+        List<Float> higher = new ArrayList<>();
+        for (Float value : countPerValue.keySet()) {
+            if (value > mostPopular) {
+                higher.add(value);
+            }
+        }
+
+        return higher.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
+    }
+
+
+    public Float getHighest() {
+        Float highest = null;
+        for (Float value : countPerValue.keySet()) {
+            if (highest == null) {
+                highest = value;
+            } else if (value > highest) {
+                highest = value;
+            }
+        }
+        return highest;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Footer.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Header.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Orientation.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Page.java

@@ -0,0 +1,41 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
+
+@Data
+@RequiredArgsConstructor
+public class Page {
+
+    @NonNull
+    private List<AbstractTextContainer> textBlocks;
+
+    private List<PdfImage> images;
+
+    private Rectangle bodyTextFrame;
+
+    private boolean landscape;
+    private int rotation;
+
+    private int pageNumber;
+
+    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
+
+    private double cropBoxArea;
+
+
+    public boolean isRotated() {
+
+        return rotation != 0;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Paragraph.java

@@ -0,0 +1,64 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class Paragraph implements Comparable {
+
+    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
+    private List<PdfImage> images = new ArrayList<>();
+    private String headline;
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        pageBlocks.forEach(block -> {
+            if (block instanceof TextBlock) {
+                searchableText.addAll(((TextBlock) block).getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+
+    public List<Table> getTables() {
+
+        List<Table> tables = new ArrayList<>();
+        pageBlocks.forEach(block -> {
+            if (block instanceof Table) {
+                tables.add((Table) block);
+            }
+        });
+        return tables;
+    }
+
+
+    public List<TextBlock> getTextBlocks() {
+
+        List<TextBlock> textBlocks = new ArrayList<>();
+        pageBlocks.forEach(block -> {
+            if (block instanceof TextBlock) {
+                textBlocks.add((TextBlock) block);
+            }
+        });
+        return textBlocks;
+    }
+
+
+    @Override
+    public int compareTo(Object o) {
+
+        return 0;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/SectionText.java

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+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.SearchableText;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionText {
+
+    private int sectionNumber;
+    private String text;
+
+    private boolean isTable;
+    private String headline;
+
+    private List<SectionArea> sectionAreas = new ArrayList<>();
+    private Set<Image> images = new HashSet<>();
+
+    private List<TextBlock> textBlocks = new ArrayList<>();
+    private Map<String, CellValue> tabularData = new HashMap<>();
+    private List<Integer> cellStarts = new ArrayList<>();
+
+
+    public void setTabularData(Map<String, CellValue> tabularData) {
+        tabularData.remove(null);
+        this.tabularData = tabularData;
+    }
+
+    @JsonIgnore
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block != null) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/StringFrequencyCounter.java

@@ -0,0 +1,49 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StringFrequencyCounter {
+
+    @Getter
+    private final Map<String, Integer> countPerValue = new HashMap<>();
+
+
+    public void add(String value) {
+
+        if (!countPerValue.containsKey(value)) {
+            countPerValue.put(value, 1);
+        } else {
+            countPerValue.put(value, countPerValue.get(value) + 1);
+        }
+    }
+
+
+    public void addAll(Map<String, Integer> otherCounter) {
+
+        for (Map.Entry<String, Integer> entry : otherCounter.entrySet()) {
+            if (countPerValue.containsKey(entry.getKey())) {
+                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
+            } else {
+                countPerValue.put(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+
+    public String getMostPopular() {
+
+        Map.Entry<String, Integer> mostPopular = null;
+        for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null) {
+                mostPopular = entry;
+            } else if (entry.getValue() > mostPopular.getValue()) {
+                mostPopular = entry;
+            }
+        }
+        return mostPopular != null ? mostPopular.getKey() : null;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/Text.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/TextBlock.java

@@ -0,0 +1,145 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@Builder
+@Data
+@NoArgsConstructor
+public class TextBlock extends AbstractTextContainer {
+
+    @Builder.Default
+    private List<TextPositionSequence> sequences = new ArrayList<>();
+    private int rotation;
+
+    private String mostPopularWordFont;
+    private String mostPopularWordStyle;
+    private float mostPopularWordFontSize;
+    private float mostPopularWordHeight;
+    private float mostPopularWordSpaceWidth;
+
+    private float highestFontSize;
+
+    private String classification;
+
+
+    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
+        this.minX = minX;
+        this.maxX = maxX;
+        this.minY = minY;
+        this.maxY = maxY;
+        this.sequences = sequences;
+        this.rotation = rotation;
+    }
+
+    public TextBlock union(TextPositionSequence r) {
+        TextBlock union = this.copy();
+        union.add(r);
+        return union;
+    }
+
+    public TextBlock union(TextBlock r) {
+        TextBlock union = this.copy();
+        union.add(r);
+        return union;
+    }
+
+    public void add(TextBlock r) {
+        if (r.getMinX() < minX) {
+            minX = r.getMinX();
+        }
+        if (r.getMaxX() > maxX) {
+            maxX = r.getMaxX();
+        }
+        if (r.getMinY() < minY) {
+            minY = r.getMinY();
+        }
+        if (r.getMaxY() > maxY) {
+            maxY = r.getMaxY();
+        }
+        sequences.addAll(r.getSequences());
+    }
+
+    public void add(TextPositionSequence r) {
+        if (r.getX1() < minX) {
+            minX = r.getX1();
+        }
+        if (r.getX2() > maxX) {
+            maxX = r.getX2();
+        }
+        if (r.getY1() < minY) {
+            minY = r.getY1();
+        }
+        if (r.getY2() > maxY) {
+            maxY = r.getY2();
+        }
+    }
+
+    public TextBlock copy() {
+        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation);
+    }
+
+    public void resize(float x1, float y1, float width, float height) {
+        set(x1, y1, x1 + width, y1 + height);
+    }
+
+    public void set(float x1, float y1, float x2, float y2) {
+        this.minX = Math.min(x1, x2);
+        this.maxX = Math.max(x1, x2);
+        this.minY = Math.min(y1, y2);
+        this.maxY = Math.max(y1, y2);
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder builder = new StringBuilder();
+
+        for (int i = 0; i < sequences.size(); i++) {
+            String sequenceAsString = sequences.get(i).toString();
+            // Fix for missing Whitespace. This is recognized in getSequences method. See PDFTextStripper Line 1730.
+            if (i != 0 && sequences.get(i - 1).charAt(sequences.get(i - 1).length() - 1) != ' ' && sequenceAsString.charAt(0) != ' ') {
+                builder.append(' ');
+            }
+            builder.append(sequenceAsString);
+        }
+
+        return builder.toString();
+
+    }
+
+    @Override
+    @JsonIgnore
+    public String getText() {
+
+        StringBuilder sb = new StringBuilder();
+
+        TextPositionSequence previous = null;
+        for (TextPositionSequence word : sequences) {
+            if (previous != null) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                    sb.append('\n');
+                } else {
+                    sb.append(' ');
+                }
+            }
+            sb.append(word.toString());
+            previous = word;
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
+
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/model/UnclassifiedText.java

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+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
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/BlockificationService.java

@@ -0,0 +1,294 @@
+package com.iqser.red.service.redaction.v1.server.classification.service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
+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;
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@Service
+@SuppressWarnings("all")
+public class BlockificationService {
+
+    static final float THRESHOLD = 1f;
+
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
+                         List<Ruling> verticalRulingLines) {
+
+        List<TextPositionSequence> chunkWords = new ArrayList<>();
+        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
+
+        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
+        TextPositionSequence prev = null;
+
+        boolean wasSplitted = false;
+        Float splitX1 = null;
+        for (TextPositionSequence word : textPositions) {
+
+            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
+            boolean startFromTop = word.getY1() > maxY + word.getHeight();
+            boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1();
+            boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1();
+            boolean splittedByRuling = word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || word
+                    .getRotation() == 0 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines);
+
+            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
+
+                Orientation prevOrientation = null;
+                if(!chunkBlockList1.isEmpty()) {
+                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
+                }
+
+                TextBlock cb1 = buildTextBlock(chunkWords);
+                chunkBlockList1.add(cb1);
+                chunkWords = new ArrayList<>();
+
+                if (splitByX && !splittedByRuling) {
+                    wasSplitted = true;
+                    cb1.setOrientation(Orientation.LEFT);
+                    splitX1 = word.getX1();
+                } else
+
+                if (newLineAfterSplit && !splittedByRuling) {
+                    wasSplitted = false;
+                    cb1.setOrientation(Orientation.RIGHT);
+                    splitX1 = null;
+                } else
+
+                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
+                    cb1.setOrientation(Orientation.LEFT);
+                }
+
+                minX = 1000;
+                maxX = 0;
+                minY = 1000;
+                maxY = 0;
+                prev = null;
+            }
+
+            chunkWords.add(word);
+
+            prev = word;
+            if (word.getX1() < minX) {
+                minX = word.getX1();
+            }
+            if (word.getX2() > maxX) {
+                maxX = word.getX2();
+            }
+            if (word.getY1() < minY) {
+                minY = word.getY1();
+            }
+            if (word.getY2() > maxY) {
+                maxY = word.getY2();
+            }
+        }
+
+        TextBlock cb1 = buildTextBlock(chunkWords);
+        if (cb1 != null) {
+            chunkBlockList1.add(cb1);
+        }
+
+        Iterator<AbstractTextContainer> itty = chunkBlockList1.iterator();
+
+        TextBlock previousLeft = null;
+        TextBlock previousRight = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
+                    previousLeft.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
+                    previousRight.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (block.getOrientation().equals(Orientation.LEFT)) {
+                previousLeft = block;
+            } else if (block.getOrientation().equals(Orientation.RIGHT)) {
+                previousRight = block;
+            }
+        }
+
+
+        itty = chunkBlockList1.iterator();
+        TextBlock previous = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())||
+                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())){
+                previous.add(block);
+                itty.remove();
+                continue;
+            }
+
+            previous = block;
+        }
+
+
+        return new Page(chunkBlockList1);
+    }
+
+    private boolean equalsWithThreshold(float f1, float f2){
+        return Math.abs(f1 - f2) < THRESHOLD;
+    }
+
+
+    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {
+
+        TextBlock textBlock = null;
+
+        FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
+        FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
+        FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
+        StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
+        StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
+
+        for (TextPositionSequence wordBlock : wordBlockList) {
+
+            lineHeightFrequencyCounter.add(wordBlock.getTextHeight());
+            fontSizeFrequencyCounter.add(wordBlock.getFontSize());
+            spaceFrequencyCounter.add(wordBlock.getSpaceWidth());
+            fontFrequencyCounter.add(wordBlock.getFont());
+            styleFrequencyCounter.add(wordBlock.getFontStyle());
+
+            if (textBlock == null) {
+                textBlock = new TextBlock(wordBlock.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());
+            }
+        }
+
+        if (textBlock != null) {
+            textBlock.setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
+            textBlock.setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
+            textBlock.setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
+            textBlock.setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
+            textBlock.setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
+            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
+        }
+
+        return textBlock;
+    }
+
+
+    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1,
+                                       List<Ruling> rulingLines) {
+
+        for (Ruling ruling : rulingLines) {
+            if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter,
+                                            boolean landscape) {
+
+        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);
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/service/ClassificationService.java

@@ -0,0 +1,117 @@
+package com.iqser.red.service.redaction.v1.server.classification.service;
+
+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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ClassificationService {
+
+    private final BlockificationService blockificationService;
+
+
+    public void classifyDocument(Document document) {
+
+        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()) {
+            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
+            page.setBodyTextFrame(btf);
+            classifyPage(btf, page, document, 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, bodyTextFrame, page, document, headlineFontSizes);
+            }
+        }
+    }
+
+
+    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
+                              List<Float> headlineFontSizes) {
+
+        if (document.getFontSizeCounter().getMostPopular() == null) {
+            // TODO Figure out why this happens.
+            return;
+        }
+        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) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
+            textBlock.setClassification("Footer");
+        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
+                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
+                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
+                .getMostPopular() || page.getTextBlocks().size() == 1)) {
+            if (!Pattern.matches("[0-9]+", textBlock.toString())) {
+                textBlock.setClassification("Title");
+            }
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {
+
+            for (int i = 1; i <= headlineFontSizes.size(); i++) {
+                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
+                    textBlock.setClassification("H " + i);
+                    document.setHeadlines(true);
+                }
+            }
+        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
+                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
+            document.setHeadlines(true);
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
+            textBlock.setClassification("TextBlock Bold");
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
+                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
+                .equals(document.getFontStyleCounter()
+                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular()) {
+            textBlock.setClassification("TextBlock");
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("italic") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+            textBlock.setClassification("TextBlock Italic");
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
+            textBlock.setClassification("TextBlock Unknown");
+        } else {
+            textBlock.setClassification("Other");
+        }
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/classification/utils/PositionUtils.java

@@ -0,0 +1,94 @@
+package com.iqser.red.service.redaction.v1.server.classification.utils;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+@SuppressWarnings("all")
+public class PositionUtils {
+
+
+    public boolean isWithinBodyTextFrame(Rectangle btf, TextBlock textBlock) {
+
+        //TODO Currently this is not working for rotated pages.
+
+        if (btf == null || textBlock == null) {
+            return false;
+        }
+
+        double threshold = textBlock.getMostPopularWordHeight() * 3;
+
+        if (textBlock.getMinX() + threshold > btf.getX() &&
+                textBlock.getMaxX() - threshold < btf.getX() + btf.getWidth() &&
+                textBlock.getMinY() + threshold > btf.getY() &&
+                textBlock.getMaxY() - threshold < btf.getY() + btf.getHeight()) {
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+
+    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, boolean rotated) {
+
+        if (btf == null || textBlock == null) {
+            return false;
+        }
+
+        if (rotated && textBlock.getMinX() < btf.getX()) {
+            // Its very strange, P{0,0} is on top left in this case, instead of lower left.
+            return true;
+        } else if (!rotated && textBlock.getMinY() > btf.getY() + btf.getHeight()) {
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+
+    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
+
+        //TODO Currently this is not working for rotated pages.
+
+        if (btf == null || textBlock == null) {
+            return false;
+        }
+
+        if (textBlock.getMaxY() < btf.getY()) {
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+
+    public boolean isTouchingUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
+
+        //TODO Currently this is not working for rotated pages.
+
+        if (btf == null || textBlock == null) {
+            return false;
+        }
+
+        if (textBlock.getMinY() < btf.getY()) {
+            return true;
+        } else {
+            return false;
+        }
+
+    }
+
+
+    public float getHeightDifferenceBetweenChunkWordAndDocumentWord(TextBlock textBlock, Float documentMostPopularWordHeight) {
+        return textBlock.getMostPopularWordHeight() - documentMostPopularWordHeight;
+    }
+
+
+    public Float getApproxLineCount(TextBlock textBlock) {
+        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
+    }
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/DictionaryClient.java

@@ -2,9 +2,8 @@ package com.iqser.red.service.redaction.v1.server.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.persistence.service.v1.api.internal.resources.DictionaryResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;
 
 @FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
-
-}
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/EntityRecognitionClient.java

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import java.util.List;
+import java.util.Map;
+
+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.EntityRecogintionEntity;
+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);
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/FileStatusProcessingUpdateClient.java

@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileStatusProcessingUpdateResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;
 
 @FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/ImageClassificationClient.java

@@ -0,0 +1,15 @@
+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 org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
+public interface ImageClassificationClient {
+
+    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ImageClassificationResponse classify(@RequestBody MultipartFile file);
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/ImageClassificationResponse.java

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageClassificationResponse {
+
+    private String category;
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/LegalBasisClient.java

@@ -2,9 +2,8 @@ package com.iqser.red.service.redaction.v1.server.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.persistence.service.v1.api.internal.resources.LegalBasisMappingResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMappingResource;
 
 @FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
 public interface LegalBasisClient extends LegalBasisMappingResource {
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/MockMultipartFile.java

@@ -1,16 +1,16 @@
 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;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 public class MockMultipartFile implements MultipartFile {
 
     private final String name;
@@ -32,7 +32,8 @@ public class MockMultipartFile implements MultipartFile {
     }
 
 
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, @Nullable byte[] content) {
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             @Nullable byte[] content) {
 
         Assert.hasLength(name, "Name must not be empty");
         this.name = name;
@@ -42,7 +43,8 @@ public class MockMultipartFile implements MultipartFile {
     }
 
 
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, InputStream contentStream) throws IOException {
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             InputStream contentStream) throws IOException {
 
         this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
     }
@@ -80,13 +82,13 @@ public class MockMultipartFile implements MultipartFile {
     }
 
 
-    public byte[] getBytes() {
+    public byte[] getBytes() throws IOException {
 
         return this.content;
     }
 
 
-    public InputStream getInputStream() {
+    public InputStream getInputStream() throws IOException {
 
         return new ByteArrayInputStream(this.content);
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/RulesClient.java

@@ -2,9 +2,8 @@ package com.iqser.red.service.redaction.v1.server.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.persistence.service.v1.api.internal.resources.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;
 
 @FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecogintionEntity.java

@@ -0,0 +1,19 @@
+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 EntityRecogintionEntity {
+
+      private String value;
+      private int startOffset;
+      private int endOffset;
+      private String type;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionRequest.java

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.client.model;
 
+import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -10,11 +11,8 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class EntityRecognitionEntity {
+public class EntityRecognitionRequest {
 
-    private String value;
-    private int startOffset;
-    private int endOffset;
-    private String type;
+   private List<EntityRecognitionSection> data;
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionResult.java

@@ -0,0 +1,20 @@
+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<>();
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/EntityRecognitionSection.java

@@ -13,5 +13,4 @@ public class EntityRecognitionSection {
 
     private int sectionNumber;
     private String text;
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/model/NerEntities.java

@@ -5,14 +5,17 @@ import java.util.List;
 import java.util.Map;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@NoArgsConstructor
+@Builder
 @AllArgsConstructor
-public class NerEntitiesModel {
+@NoArgsConstructor
+public class NerEntities {
 
-    private Map<Integer, List<EntityRecognitionEntity>> data = new HashMap<>();
+   @Builder.Default
+   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/ControllerAdvice.java

@@ -1,11 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
 import com.iqser.red.commons.spring.ErrorMessage;
-import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;
-
+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;
@@ -20,12 +17,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,21 +29,10 @@ 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());
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java

@@ -1,33 +1,182 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
+import com.amazonaws.services.kms.model.NotFoundException;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+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.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 org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.iqser.red.service.redaction.v1.model.DroolsSyntaxValidation;
-import com.iqser.red.service.redaction.v1.model.RuleValidationModel;
-import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.service.drools.DroolsSyntaxValidationService;
-import com.iqser.red.service.redaction.v1.server.utils.exception.RulesValidationException;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 @Slf4j
 @RestController
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
 
-    private final DroolsSyntaxValidationService droolsSyntaxValidationService;
+    private final PdfVisualisationService pdfVisualisationService;
+    private final DroolsExecutionService droolsExecutionService;
+    private final DictionaryService dictionaryService;
+    private final AnnotationService annotationService;
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionStorageService redactionStorageService;
+    private final RedactionLogMergeService redactionLogMergeService;
 
+    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
-    @Override
-    public DroolsSyntaxValidation testRules(@RequestBody RuleValidationModel rulesValidationModel) {
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
+        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
+
+        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
+            pdDocument.setAllSecurityToBeRemoved(true);
+
+            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
+            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
+
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
+            }
 
-        try {
-            return droolsSyntaxValidationService.testRules(rulesValidationModel);
         } catch (Exception e) {
-            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
+            throw new RedactionException(e);
         }
     }
 
+
+    @Override
+    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        try {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
+                pdDocument.setAllSecurityToBeRemoved(true);
+
+                pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
+
+                return convert(pdDocument, classifiedDoc.getPages().size());
+
+            } catch (IOException e) {
+                throw new RedactionException(e);
+            }
+
+        } catch (IOException e) {
+            throw new RedactionException(e);
+        }
+
+
+    }
+
+    @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(storedObjectStream);
+
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
+                pdDocument.setAllSecurityToBeRemoved(true);
+
+                pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
+                return convert(pdDocument, classifiedDoc.getPages().size());
+
+            } catch (IOException e) {
+                throw new RedactionException(e);
+            }
+
+        } catch (IOException e) {
+            throw new RedactionException(e);
+        }
+
+
+    }
+
+
+    @Override
+    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {
+
+        Document classifiedDoc;
+
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
+        } catch (Exception 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 testRules(@RequestBody String rules) {
+
+        droolsExecutionService.testRules(rules);
+    }
+
+    @Override
+    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
+
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+        if (redactionLog == null) {
+            throw new NotFoundException("RedactionLog not present");
+        }
+
+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        if (redactionLog.getAnalysisVersion() == 0) {
+            // old redaction logs are returned directly
+            return redactionLog;
+        } else {
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+        }
+    }
+
+    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            document.save(byteArrayOutputStream);
+            return RedactionResult.builder()
+                    .document(byteArrayOutputStream.toByteArray())
+                    .numberOfPages(numberOfPages)
+                    .build();
+        }
+
+    }
+
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java

@@ -1,28 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.util.Collections;
-
-import org.springframework.web.bind.annotation.RestController;
 
 import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
 import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
-
+import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
 public class RuleBuilderController implements RuleBuilderResource {
 
+    private final RuleBuilderModelService ruleBuilderModelService;
 
     @Override
     public RuleBuilderModel getRuleBuilderModel() {
-
-        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
-
-        ruleBuilderModel.setWhenClauses(Collections.emptyList());
-        ruleBuilderModel.setThenConditions(Collections.emptyList());
-
-        return ruleBuilderModel;
+        return ruleBuilderModelService.getRuleBuilderModel();
     }
 
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/exception/RedactionException.java

@@ -1,15 +1,12 @@
-package com.iqser.red.service.redaction.v1.server.utils.exception;
+package com.iqser.red.service.redaction.v1.server.exception;
 
 public class RedactionException extends RuntimeException {
 
     public RedactionException(Throwable cause) {
-
         super("Could not parse document", cause);
     }
 
-
     public RedactionException() {
-
         super("Could not parse document");
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/exception/RulesValidationException.java

@@ -1,9 +1,8 @@
-package com.iqser.red.service.redaction.v1.server.utils.exception;
+package com.iqser.red.service.redaction.v1.server.exception;
 
 public class RulesValidationException extends RuntimeException {
 
     public RulesValidationException(String message, Throwable t) {
-
         super(message, t);
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/memory/MemoryStats.java

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.memory;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+
+@Slf4j
+public class MemoryStats {
+
+
+    public static void printMemoryStats() {
+        log.info("\n\n ------------------------------ \n" +
+                " Used Memory: " + humanReadableByteCountBin(getUsedMemory()) + "\n" +
+                " Free Memory: " + humanReadableByteCountBin(getFreeMemory()) + "\n" +
+                " Total Memory: " + humanReadableByteCountBin(getTotalMemory()) + "\n" +
+                " Max Memory: " + humanReadableByteCountBin(getMaxMemory()) + "\n" +
+                "\n ------------------------------ \n");
+    }
+
+
+    public static String humanReadableByteCountBin(long bytes) {
+        long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
+        if (absB < 1024) {
+            return bytes + " B";
+        }
+        long value = absB;
+        CharacterIterator ci = new StringCharacterIterator("KMGTPE");
+        for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10) {
+            value >>= 10;
+            ci.next();
+        }
+        value *= Long.signum(bytes);
+        return String.format("%.1f %ciB", value / 1024.0, ci.current());
+    }
+
+    private static long getMaxMemory() {
+        return Runtime.getRuntime().maxMemory();
+    }
+
+    private static long getUsedMemory() {
+        return getMaxMemory() - getFreeMemory();
+    }
+
+    private static long getTotalMemory() {
+        return Runtime.getRuntime().totalMemory();
+    }
+
+    private static long getFreeMemory() {
+        return Runtime.getRuntime().freeMemory();
+    }
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/KieWrapper.java

@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model;
-
-import org.kie.api.runtime.KieContainer;
-
-public record KieWrapper(KieContainer container, long rulesVersion) {
-
-    public static KieWrapper empty() {
-
-        return new KieWrapper(null, -1);
-    }
-
-
-    public boolean isPresent() {
-
-        return container != null && rulesVersion >= 0;
-    }
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/ManualEntity.java

@@ -1,116 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model;
-
-import java.util.List;
-import java.util.PriorityQueue;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.ManualChangeOverwrite;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class ManualEntity implements IEntity {
-
-    // The id must be mapped into a TextEntity as is for comments to work correctly
-    String id;
-    String value;
-    List<RectangleWithPage> entityPosition;
-    String ruleIdentifier;
-    String reason;
-    String legalBasis;
-    String type;
-    String section;
-    EntityType entityType;
-    boolean applied;
-    boolean isDictionaryEntry;
-    boolean isDossierDictionaryEntry;
-    boolean rectangle;
-
-    @Builder.Default
-    PriorityQueue<MatchedRule> matchedRuleList = new PriorityQueue<>();
-    @Builder.Default
-    ManualChangeOverwrite manualOverwrite = new ManualChangeOverwrite();
-
-
-    public static ManualEntity fromRedactionLogEntry(RedactionLogEntry redactionLogEntry) {
-
-        String ruleIdentifier = redactionLogEntry.getType() + "." + redactionLogEntry.getMatchedRule() + ".0";
-        List<RectangleWithPage> rectangleWithPages = redactionLogEntry.getPositions().stream().map(RectangleWithPage::fromRedactionLogRectangle).toList();
-        return ManualEntity.builder()
-                .id(redactionLogEntry.getId())
-                .value(redactionLogEntry.getValue())
-                .entityPosition(rectangleWithPages)
-                .ruleIdentifier(ruleIdentifier)
-                .reason(redactionLogEntry.getReason())
-                .legalBasis(redactionLogEntry.getLegalBasis())
-                .type(redactionLogEntry.getType())
-                .section(redactionLogEntry.getSection()).entityType(getEntityType(redactionLogEntry))
-                .applied(redactionLogEntry.isRedacted())
-                .isDictionaryEntry(redactionLogEntry.isDictionaryEntry())
-                .isDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry())
-                .rectangle(redactionLogEntry.isRectangle())
-                .build();
-    }
-
-
-    private static EntityType getEntityType(RedactionLogEntry redactionLogEntry) {
-
-        if (redactionLogEntry.isRecommendation()) {
-            return EntityType.RECOMMENDATION;
-        }
-        if (redactionLogEntry.isHint()) {
-            return EntityType.HINT;
-        }
-        return EntityType.ENTITY;
-    }
-
-
-    public static ManualEntity fromManualRedactionEntry(ManualRedactionEntry manualRedactionEntry, boolean hint) {
-
-        List<RectangleWithPage> rectangleWithPages = manualRedactionEntry.getPositions().stream().map(RectangleWithPage::fromAnnotationRectangle).toList();
-        ManualChangeOverwrite manualChangeOverwrite = new ManualChangeOverwrite();
-        manualChangeOverwrite.addChange(manualRedactionEntry);
-        return ManualEntity.builder()
-                .id(manualRedactionEntry.getAnnotationId())
-                .value(manualRedactionEntry.getValue())
-                .entityPosition(rectangleWithPages)
-                .ruleIdentifier("MAN.0.0")
-                .reason(manualRedactionEntry.getReason())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .type(manualRedactionEntry.getType())
-                .section(manualRedactionEntry.getSection()).entityType(hint ? EntityType.HINT : EntityType.ENTITY)
-                .applied(true)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(false)
-                .rectangle(manualRedactionEntry.isRectangle())
-                .manualOverwrite(manualChangeOverwrite)
-                .build();
-    }
-
-
-    @Override
-    public TextRange getTextRange() {
-
-        return new TextRange(-1, -1);
-    }
-
-
-    @Override
-    public String type() {
-
-        return getManualOverwrite().getType().orElse(type);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/NerEntities.java

@@ -1,44 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@AllArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-public class NerEntities {
-
-    List<NerEntity> nerEntityList;
-
-
-    public NerEntities() {
-
-        nerEntityList = new LinkedList<>();
-    }
-
-
-    public boolean hasEntitiesOfType(String type) {
-
-        return nerEntityList.stream().anyMatch(nerEntity -> nerEntity.type.equals(type));
-    }
-
-
-    public Stream<NerEntity> streamEntitiesOfType(String type) {
-
-        return nerEntityList.stream().filter(nerEntity -> nerEntity.type().equals(type));
-    }
-
-
-    public record NerEntity(String value, TextRange textRange, String type) {
-
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/RectangleWithPage.java

@@ -1,32 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model;
-
-import java.awt.geom.Rectangle2D;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
-
-public record RectangleWithPage(int pageNumber, Rectangle2D rectangle2D) {
-
-    public static RectangleWithPage fromRedactionLogRectangle(Rectangle rectangle) {
-
-        return new RectangleWithPage(rectangle.getPage(), toRectangle2D(rectangle));
-    }
-
-
-    public static RectangleWithPage fromAnnotationRectangle(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rectangle) {
-
-        return new RectangleWithPage(rectangle.getPage(), toRectangle2D(rectangle));
-    }
-
-
-    private static Rectangle2D toRectangle2D(Rectangle rectangle) {
-
-        return new Rectangle2D.Float(rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getWidth(), rectangle.getHeight());
-    }
-
-
-    private static Rectangle2D toRectangle2D(com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle rectangle) {
-
-        return new Rectangle2D.Float(rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getWidth(), rectangle.getHeight());
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/component/Component.java

@@ -1,41 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.component;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.model.drools.RuleIdentifier;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class Component {
-
-    RuleIdentifier matchedRule;
-    String name;
-    String value;
-    String valueDescription;
-
-    List<Entity> references;
-
-
-    public boolean addReference(Entity entity) {
-
-        return references.add(entity);
-    }
-
-
-    public boolean addReferences(Collection<Entity> entities) {
-
-        return references.addAll(entities);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/component/Entity.java

@@ -1,101 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.component;
-
-import java.util.List;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Change;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Engine;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.ManualChange;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.Document;
-import com.iqser.red.service.redaction.v1.server.model.document.nodes.SemanticNode;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.experimental.FieldDefaults;
-
-@Getter
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class Entity {
-
-    String id;
-    String type;
-    EntryType entryType;
-    EntryState state;
-    String value;
-    String reason;
-    String matchedRule;
-    String legalBasis;
-
-    boolean imported;
-
-    SemanticNode containingNode;
-    String section;
-    float[] color;
-
-    List<Position> positions;
-
-    String textBefore;
-    String textAfter;
-
-    int startOffset;
-    int endOffset;
-    int length;
-
-    boolean imageHasTransparency;
-
-    boolean isDictionaryEntry;
-    boolean isDossierDictionaryEntry;
-
-    boolean excluded;
-
-    List<Change> changes;
-
-    List<ManualChange> manualChanges;
-
-    Set<Engine> engines;
-
-    Set<String> reference;
-
-    Set<String> importedRedactionIntersections;
-
-
-    public static Entity fromEntityLogEntry(EntityLogEntry e, Document document) {
-
-        return Entity.builder()
-                .id(e.getId())
-                .type(e.getType())
-                .entryType(e.getEntryType())
-                .state(e.getState())
-                .value(e.getValue())
-                .reason(e.getReason())
-                .matchedRule(e.getMatchedRule())
-                .legalBasis(e.getLegalBasis())
-                .imported(e.isImported())
-                .section(e.getSection())
-                .color(e.getColor()).positions(e.getPositions()).containingNode(document.getDocumentTree().getEntryById(e.getContainingNodeId()).getNode())
-                .textBefore(e.getTextBefore())
-                .textAfter(e.getTextAfter())
-                .startOffset(e.getStartOffset())
-                .endOffset(e.getEndOffset())
-                .length(e.getValue().length())
-                .imageHasTransparency(e.isImageHasTransparency())
-                .isDictionaryEntry(e.isDictionaryEntry())
-                .isDossierDictionaryEntry(e.isDossierDictionaryEntry())
-                .excluded(e.isExcluded())
-                .changes(e.getChanges())
-                .manualChanges(e.getManualChanges())
-                .engines(e.getEngines())
-                .reference(e.getReference())
-                .importedRedactionIntersections(e.getImportedRedactionIntersections())
-                .build();
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/Dictionary.java

@@ -1,145 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.dictionary;
-
-import static java.lang.String.format;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.iqser.red.service.redaction.v1.server.utils.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.TextEntity;
-import com.iqser.red.service.redaction.v1.server.utils.Patterns;
-
-import lombok.Data;
-import lombok.Getter;
-
-@Data
-public class Dictionary {
-
-    @Getter
-    private List<DictionaryModel> dictionaryModels;
-    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
-
-    @Getter
-    private DictionaryVersion version;
-
-
-    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
-
-        this.dictionaryModels = dictionaryModels;
-        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
-        this.version = version;
-    }
-
-
-    public int getDictionaryRank(String type) {
-
-        if (!localAccessMap.containsKey(type)) {
-            return 0;
-        }
-        return localAccessMap.get(type).getRank();
-    }
-
-
-    public boolean hasLocalEntries() {
-
-        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntriesWithMatchedRules().isEmpty());
-    }
-
-
-    public Set<String> getTypes() {
-
-        return localAccessMap.keySet();
-    }
-
-
-    public DictionaryModel getType(String type) {
-
-        DictionaryModel model = localAccessMap.get(type);
-        if (model == null) {
-            throw new NotFoundException("Type: " + type + " is not found");
-        }
-        return model;
-    }
-
-
-    public boolean isHint(String type) {
-
-        DictionaryModel model = localAccessMap.get(type);
-        if (model != null) {
-            return model.isHint();
-        }
-        return false;
-    }
-
-
-    public boolean isCaseInsensitiveDictionary(String type) {
-
-        DictionaryModel dictionaryModel = localAccessMap.get(type);
-        if (dictionaryModel != null) {
-            return dictionaryModel.isCaseInsensitive();
-        }
-        return false;
-    }
-
-
-    private void addLocalDictionaryEntry(String type, String value, Collection<MatchedRule> matchedRules, boolean alsoAddLastname) {
-
-        if (value.isBlank()) {
-            return;
-        }
-        if (localAccessMap.get(type) == null) {
-            throw new IllegalArgumentException(format("DictionaryModel of type %s does not exist", type));
-        }
-        if (localAccessMap.get(type).getLocalEntriesWithMatchedRules() == null) {
-            throw new IllegalArgumentException(format("DictionaryModel of type %s has no local Entries", type));
-        }
-        if (StringUtils.isEmpty(value)) {
-            throw new IllegalArgumentException(format("%s is not a valid dictionary entry", value));
-        }
-        Set<MatchedRule> matchedRulesSet = new HashSet<>(matchedRules);
-        localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(value.trim(), matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
-        if (alsoAddLastname) {
-            String lastname = value.split(" ")[0];
-            localAccessMap.get(type).getLocalEntriesWithMatchedRules().merge(lastname, matchedRulesSet, (set1, set2) -> Stream.concat(set1.stream(), set2.stream()).collect(Collectors.toSet()));
-        }
-    }
-
-
-    public void recommendEverywhere(TextEntity textEntity) {
-
-        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), false);
-    }
-
-
-    public void recommendEverywhereWithLastNameSeparately(TextEntity textEntity) {
-
-        addLocalDictionaryEntry(textEntity.getType(), textEntity.getValue(), textEntity.getMatchedRuleList(), true);
-    }
-
-
-    public void addMultipleAuthorsAsRecommendation(TextEntity textEntity) {
-
-        String cleanedWord = textEntity.getValue().replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
-        Pattern pattern = Patterns.AUTHOR_TABLE_SPLITTER;
-        Matcher matcher = pattern.matcher(cleanedWord);
-
-        while (matcher.find()) {
-            String match = matcher.group().trim();
-            if (match.length() >= 3) {
-                addLocalDictionaryEntry(textEntity.getType(), match, textEntity.getMatchedRuleList(), true);
-            }
-        }
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryEntries.java

@@ -1,26 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.dictionary;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DictionaryEntries {
-
-    @Builder.Default
-    Set<DictionaryEntryModel> entries = new HashSet<>();
-    @Builder.Default
-    Set<DictionaryEntryModel> falsePositives = new HashSet<>();
-    @Builder.Default
-    Set<DictionaryEntryModel> falseRecommendations = new HashSet<>();
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/DictionaryModel.java

@@ -1,112 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.dictionary;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.iqser.red.service.dictionarymerge.commons.DictionaryEntry;
-import com.iqser.red.service.dictionarymerge.commons.DictionaryEntryModel;
-import com.iqser.red.service.redaction.v1.server.model.document.entity.MatchedRule;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class DictionaryModel implements Serializable {
-
-    private final String type;
-    private final int rank;
-    private final float[] color;
-    private final boolean caseInsensitive;
-    private final boolean hint;
-    private final boolean isDossierDictionary;
-    private final Set<DictionaryEntryModel> entries;
-    private final Set<DictionaryEntryModel> falsePositives;
-    private final Set<DictionaryEntryModel> falseRecommendations;
-
-    private transient SearchImplementation entriesSearch;
-    private transient SearchImplementation falsePositiveSearch;
-    private transient SearchImplementation falseRecommendationsSearch;
-
-    private final HashMap<String, Set<MatchedRule>> localEntriesWithMatchedRules = new HashMap<>();
-    private transient SearchImplementation localSearch;
-
-
-    public DictionaryModel(String type,
-                           int rank,
-                           float[] color,
-                           boolean caseInsensitive,
-                           boolean hint,
-                           Set<DictionaryEntryModel> entries,
-                           Set<DictionaryEntryModel> falsePositives,
-                           Set<DictionaryEntryModel> falseRecommendations,
-                           boolean isDossierDictionary) {
-
-        this.type = type;
-        this.rank = rank;
-        this.color = color;
-        this.caseInsensitive = caseInsensitive;
-        this.hint = hint;
-        this.isDossierDictionary = isDossierDictionary;
-
-        this.entries = entries;
-        this.falsePositives = falsePositives;
-        this.falseRecommendations = falseRecommendations;
-
-        this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntryModel::getValue).collect(Collectors.toList()),
-                caseInsensitive);
-        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntryModel::getValue).collect(Collectors.toList()),
-                caseInsensitive);
-        this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream()
-                .filter(e -> !e.isDeleted())
-                .map(DictionaryEntry::getValue)
-                .collect(Collectors.toList()), caseInsensitive);
-
-    }
-
-
-    public SearchImplementation getLocalSearch() {
-
-        if (this.localSearch == null || this.localSearch.getValues().size() != this.localEntriesWithMatchedRules.size()) {
-            this.localSearch = new SearchImplementation(this.localEntriesWithMatchedRules.keySet(), caseInsensitive);
-        }
-        return this.localSearch;
-    }
-
-
-    public SearchImplementation getEntriesSearch() {
-
-        if (entriesSearch == null) {
-            this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
-                    caseInsensitive);
-        }
-        return entriesSearch;
-    }
-
-
-    public SearchImplementation getFalsePositiveSearch() {
-
-        if (falsePositiveSearch == null) {
-            this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream()
-                    .filter(e -> !e.isDeleted())
-                    .map(DictionaryEntry::getValue)
-                    .collect(Collectors.toList()), caseInsensitive);
-        }
-        return falsePositiveSearch;
-    }
-
-
-    public SearchImplementation getFalseRecommendationsSearch() {
-
-        if (falseRecommendationsSearch == null) {
-            this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream()
-                    .filter(e -> !e.isDeleted())
-                    .map(DictionaryEntry::getValue)
-                    .collect(Collectors.toList()), caseInsensitive);
-        }
-        return falseRecommendationsSearch;
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/SearchImplementation.java

@@ -1,134 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.dictionary;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.ahocorasick.trie.Trie;
-
-import com.iqser.red.service.redaction.v1.server.model.document.TextRange;
-
-import lombok.Data;
-
-@Data
-public class SearchImplementation {
-
-    private boolean ignoreCase;
-    private List<String> values;
-
-    private Pattern pattern;
-    private Trie trie;
-
-
-    public SearchImplementation(String value, boolean ignoreCase) {
-
-        this.values = List.of(value);
-        this.ignoreCase = ignoreCase;
-        this.createSearchImplementation();
-    }
-
-
-    public SearchImplementation(Collection<String> values, boolean ignoreCase) {
-
-        this.values = new ArrayList<>(values);
-        this.ignoreCase = ignoreCase;
-        this.createSearchImplementation();
-    }
-
-
-    private void createSearchImplementation() {
-
-        if (this.values.isEmpty()) {
-            return;
-        }
-
-        if (this.values.size() == 1) {
-            var text = this.values.iterator().next();
-
-            if (this.ignoreCase) {
-                this.pattern = Pattern.compile(Pattern.quote(text.toLowerCase(Locale.ROOT)), Pattern.CASE_INSENSITIVE);
-            } else {
-                this.pattern = Pattern.compile(Pattern.quote(text));
-            }
-        } else {
-            var builder = Trie.builder();
-            if (this.ignoreCase) {
-                builder.ignoreCase();
-            }
-
-            builder.addKeywords(this.values);
-
-            this.trie = builder.build();
-        }
-    }
-
-
-    public boolean atLeastOneMatches(String text) {
-
-        String textToCheck = text;
-        if (this.values.isEmpty()) {
-            return false;
-        }
-        if (this.pattern != null) {
-            if (ignoreCase) {
-                textToCheck = textToCheck.toLowerCase(Locale.ROOT);
-            }
-            return this.pattern.matcher(textToCheck).results().findAny().isPresent();
-        } else {
-            return this.trie.containsMatch(textToCheck);
-        }
-    }
-
-
-    public List<TextRange> getBoundaries(CharSequence text) {
-
-        if (this.values.isEmpty()) {
-            return new ArrayList<>();
-        }
-        if (this.pattern != null) {
-            return this.pattern.matcher(text).results().map(r -> new TextRange(r.start(), r.end())).collect(Collectors.toList());
-        } else {
-            return this.trie.parseText(text).stream().map(r -> new TextRange(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
-        }
-    }
-
-
-    public List<TextRange> getBoundaries(CharSequence text, TextRange region) {
-
-        if (this.values.isEmpty()) {
-            return new ArrayList<>();
-        }
-        CharSequence subSequence = text.subSequence(region.start(), region.end());
-        if (this.pattern != null) {
-            return this.pattern.matcher(subSequence).results().map(r -> new TextRange(r.start() + region.start(), r.end() + region.start())).collect(Collectors.toList());
-        } else {
-            return this.trie.parseText(subSequence).stream().map(r -> new TextRange(r.getStart() + region.start(), r.getEnd() + region.start() + 1)).collect(Collectors.toList());
-        }
-    }
-
-
-    public List<MatchPosition> getMatches(String text) {
-
-        String textToCheck = text;
-        if (this.values.isEmpty()) {
-            return new ArrayList<>();
-        }
-        if (this.pattern != null) {
-            if (ignoreCase) {
-                textToCheck = textToCheck.toLowerCase(Locale.ROOT);
-            }
-            return this.pattern.matcher(textToCheck).results().map(r -> new MatchPosition(r.start(), r.end())).collect(Collectors.toList());
-        } else {
-            return this.trie.parseText(textToCheck).stream().map(r -> new MatchPosition(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
-        }
-    }
-
-
-    public record MatchPosition(int startIndex, int endIndex) {
-
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/dictionary/TenantDictionary.java

@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.dictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class TenantDictionary {
-
-    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
-    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/ConsecutiveBoundaryCollector.java

@@ -1,70 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.document;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collector;
-
-import com.google.common.base.Functions;
-
-public class ConsecutiveBoundaryCollector implements Collector<TextRange, List<TextRange>, List<TextRange>> {
-
-    @Override
-    public Supplier<List<TextRange>> supplier() {
-
-        return LinkedList::new;
-    }
-
-
-    @Override
-    public BiConsumer<List<TextRange>, TextRange> accumulator() {
-
-        return (existingList, boundary) -> {
-            if (existingList.isEmpty()) {
-                existingList.add(boundary);
-                return;
-            }
-
-            TextRange prevTextRange = existingList.get(existingList.size() - 1);
-            if (prevTextRange.end() > boundary.start()) {
-                throw new IllegalArgumentException(String.format("Can't concatenate %s and %s. Boundaries must be ordered!", prevTextRange, boundary));
-            }
-
-            if (prevTextRange.end() == boundary.start()) {
-                existingList.remove(existingList.size() - 1);
-                existingList.add(TextRange.merge(List.of(prevTextRange, boundary)));
-            } else {
-                existingList.add(boundary);
-            }
-        };
-    }
-
-
-    @Override
-    public BinaryOperator<List<TextRange>> combiner() {
-
-        return (list1, list2) -> {
-            list1.addAll(list2);
-            return list1;
-        };
-    }
-
-
-    @Override
-    public Function<List<TextRange>, List<TextRange>> finisher() {
-
-        return Functions.identity();
-    }
-
-
-    @Override
-    public Set<Characteristics> characteristics() {
-
-        return Set.of(Characteristics.IDENTITY_FINISH);
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/DocumentData.java

@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.document;
-
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPage;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentPositionData;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentStructure;
-import com.knecon.fforesight.service.layoutparser.internal.api.data.redaction.DocumentTextData;
-
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@Builder
-@AllArgsConstructor
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class DocumentData {
-
-    DocumentPage[] documentPages;
-    DocumentTextData[] documentTextData;
-    DocumentPositionData[] documentPositionData;
-    DocumentStructure documentStructure;
-
-}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/DocumentTree.java

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

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/TextRange.java

@@ -1,166 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.model.document;
-
-import static java.lang.String.format;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.model.document.textblock.TextBlock;
-
-import lombok.EqualsAndHashCode;
-import lombok.Setter;
-
-@Setter
-@EqualsAndHashCode
-public class TextRange implements Comparable<TextRange> {
-
-    private int start;
-    private int end;
-
-
-    public TextRange(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        this.start = start;
-        this.end = end;
-    }
-
-
-    public int length() {
-
-        return end - start;
-    }
-
-
-    public int start() {
-
-        return start;
-    }
-
-
-    public int end() {
-
-        return end;
-    }
-
-
-    public boolean contains(TextRange textRange) {
-
-        return start <= textRange.start() && textRange.end() <= end;
-    }
-
-
-    public boolean containedBy(TextRange textRange) {
-
-        return textRange.contains(this);
-    }
-
-
-    public boolean contains(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        return this.start <= start && end <= this.end;
-    }
-
-
-    public boolean containedBy(int start, int end) {
-
-        if (start > end) {
-            throw new IllegalArgumentException(format("start: %d > end: %d", start, end));
-        }
-        return start <= this.start && this.end <= end;
-    }
-
-
-    public boolean contains(int index) {
-
-        return start <= index && index < end;
-    }
-
-
-    public boolean intersects(TextRange textRange) {
-
-        return textRange.start() < this.end && this.start < textRange.end();
-    }
-
-
-    public List<TextRange> split(List<Integer> splitIndices) {
-
-        if (splitIndices.stream().anyMatch(idx -> !this.contains(idx))) {
-            throw new IndexOutOfBoundsException(format("%s splitting indices are out of range for %s", splitIndices.stream().filter(idx -> !this.contains(idx)).toList(), this));
-        }
-        List<TextRange> splitBoundaries = new LinkedList<>();
-        int previousIndex = start;
-        for (int splitIndex : splitIndices) {
-
-            // skip split if it would produce a boundary of length 0
-            if (splitIndex == previousIndex) {
-                continue;
-            }
-            splitBoundaries.add(new TextRange(previousIndex, splitIndex));
-            previousIndex = splitIndex;
-        }
-        splitBoundaries.add(new TextRange(previousIndex, end));
-        return splitBoundaries;
-    }
-
-
-    public static TextRange merge(Collection<TextRange> boundaries) {
-
-        int minStart = boundaries.stream().mapToInt(TextRange::start).min().orElseThrow(IllegalArgumentException::new);
-        int maxEnd = boundaries.stream().mapToInt(TextRange::end).max().orElseThrow(IllegalArgumentException::new);
-        return new TextRange(minStart, maxEnd);
-    }
-
-
-    @Override
-    public String toString() {
-
-        return format("Boundary [%d|%d)", start, end);
-    }
-
-
-    @Override
-    public int compareTo(TextRange textRange) {
-
-        if (end < textRange.end() && start < textRange.start()) {
-            return -1;
-        }
-        if (start > textRange.start() && end > textRange.end()) {
-            return 1;
-        }
-
-        return 0;
-    }
-
-
-    /**
-     * shrinks the boundary, such that textBlock.subSequence(boundary) returns a string without trailing or preceding whitespaces.
-     *
-     * @param textBlock TextBlock to check whitespaces against
-     * @return trimmed boundary
-     */
-    public TextRange trim(TextBlock textBlock) {
-
-        if (this.length() == 0) {
-            return this;
-        }
-        int trimmedStart = this.start;
-        while (textBlock.containsIndex(trimmedStart) && trimmedStart < end && Character.isWhitespace(textBlock.charAt(trimmedStart))) {
-            trimmedStart++;
-        }
-
-        int trimmedEnd = this.end;
-        while (textBlock.containsIndex(trimmedEnd - 1) && trimmedStart < trimmedEnd && Character.isWhitespace(textBlock.charAt(trimmedEnd - 1))) {
-            trimmedEnd--;
-        }
-
-        return new TextRange(trimmedStart, Math.max(trimmedEnd, trimmedStart));
-    }
-
-}