RED-4510: Generated Redaction Log and Generating will not run with profile

2022-07-26 15:38:49 +02:00 · 2022-07-26 15:38:36 +02:00 · 2022-07-26 15:25:44 +02:00 · 2022-07-26 15:15:19 +02:00 · 2022-07-26 15:15:07 +02:00 · 2022-07-26 15:05:36 +02:00
382 changed files with 126442 additions and 4501 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
+    <version>8.1.3</version>
    <relativePath/>
  </parent>

@@ -2,8 +2,11 @@ package buildjob;

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

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

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

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

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

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

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

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

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

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

-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
-
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
-                                        createJUnitParserTask()
-                                                .description("Resultparser")
-                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                                .enabled(true),
-                                        new InjectVariablesTask()
-                                                .description("Inject git Tag")
-                                                .path("git.tag")
-                                                .namespace("g")
-                                                .scope(InjectVariablesScope.LOCAL),
-                                        new VcsTagTask()
-                                                .description("${bamboo.g.gitTag}")
-                                                .tagName("${bamboo.g.gitTag}")
-                                                .defaultRepository())
-                                .dockerConfiguration(
-                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
+        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Plan created from (enter repository url of your plan)")
+                .variables(new Variable("maven_add_param", ""))
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
+                                .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository")
+                                .cleanCheckout(true)
+                                .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build")
+                                .location(Location.FILE)
+                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                .argument(SERVICE_NAME), createJUnitParserTask().description("Resultparser")
+                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                .enabled(true), new InjectVariablesTask().description("Inject git Tag")
+                                .path("git.tag")
+                                .namespace("g")
+                                .scope(InjectVariablesScope.LOCAL), new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository())
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
                .linkedRepositories("RED / " + SERVICE_NAME)

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

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

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


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

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

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

 ARG PLATFORM_JAR

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

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

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

-
    <packaging>pom</packaging>

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

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


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

-</project>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <configuration>
+                        <format>ALL</format>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
@@ -11,11 +11,51 @@

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

+    <properties>
+        <persistence-service.version>1.240.0</persistence-service.version>
+    </properties>
+
    <dependencies>
+
+        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
+        <dependency>
+            <groupId>com.dslplatform</groupId>
+            <artifactId>dsl-json-java8</artifactId>
+            <version>${dsljson.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-web</artifactId>
            <optional>true</optional>
        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>persistence-service-api-v1</artifactId>
+            <version>${persistence-service.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
@@ -1,17 +1,39 @@
 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 byte[] document;
-    private String ruleSetId;
+    private MessageType messageType;
+
+    private String dossierId;
+    private String fileId;
+    private String dossierTemplateId;
    private ManualRedactions manualRedactions;
+    private OffsetDateTime lastProcessed;
+    private int analysisNumber;
+
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();
+
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();
+
 }
+
@@ -1,5 +1,6 @@
 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;
@@ -11,9 +12,25 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnalyzeResult {

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

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

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

+import java.time.OffsetDateTime;
+
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Comment {
-
-    private String id;
-    private OffsetDateTime date;
-    private String text;
-    private String user;
+public class Change {

+    private int analysisNumber;
+    private ChangeType type;
+    private OffsetDateTime dateTime;
 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ChangeType {
+    ADDED, REMOVED, CHANGED
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Engine {
+    DICTIONARY, NER, RULE
+}
@@ -7,13 +7,13 @@ import lombok.NoArgsConstructor;

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

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

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

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

+import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

+
@Data
+@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
 public class RedactionLog {

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

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


 }
@@ -7,11 +7,11 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@NoArgsConstructor
@AllArgsConstructor
-public class AnnotateRequest {
+@NoArgsConstructor
+public class RedactionLogChanges {

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

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

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

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

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

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

    private String textBefore;
    private String textAfter;

    @Builder.Default
-    private List<Comment> comments = new ArrayList<>();
+    private List<RedactionLogComment> comments = new ArrayList<>();

    private int startOffset;
    private int endOffset;

+    private boolean isImage;
+    private boolean imageHasTransparency;
+
+    private boolean isDictionaryEntry;
+    private boolean isDossierDictionaryEntry;
+
+    private boolean excluded;
+
+    private String sourceId;
+
+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<Change> changes = new ArrayList<>();
+
+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<ManualChange> manualChanges = new ArrayList<>();
+
+    private Set<Engine> engines = new HashSet<>();
+
+    private Set<String> reference = new HashSet<>();
+
+    @Builder.Default
+    private Set<String> importedRedactionIntersections = new HashSet<>();
+
+    public boolean lastChangeIsRemoved() {
+        return last(changes).map(c -> c.getType() == ChangeType.REMOVED).orElse(false);
+    }
+
+    public boolean isLocalManualRedaction() {
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY &&
+                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+    }
+
+    public boolean isManuallyRemoved() {
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY &&
+                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+    }
+
+    private <T> Optional<T> last(List<T> list) {
+        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(list.size() - 1));
+    }
+
 }
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedactionLogLegalBasis {
+
+    private String name;
+    private String description;
+    private String reason;
+
+}
@@ -1,17 +1,32 @@
 package com.iqser.red.service.redaction.v1.model;

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

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

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

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

 }
@@ -1,22 +0,0 @@
-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
-@NoArgsConstructor
-@AllArgsConstructor
-public class RenalyzeRequest {
-
-    private byte[] document;
-    private String ruleSetId;
-    private ManualRedactions manualRedactions;
-    private Text text;
-    private RedactionLog redactionLog;
-    private OffsetDateTime lastProcessed;
-}
@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class RuleBuilderModel {
+
+    private List<RuleElement> whenClauses = new ArrayList<>();
+    private List<RuleElement> thenConditions = new ArrayList<>();
+
+}
@@ -1,17 +1,18 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

-    private List<SectionText> sectionTexts = new ArrayList<>();
+    private String conditionName;
+    private List<Argument> arguments = new ArrayList<>();

 }
@@ -3,31 +3,25 @@ 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();
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
+    }
+
+    // TODO we should only use one rectangle class.
+    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
    }

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

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

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

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

-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+
+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;
+
 }
@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SectionText {
-
-    private int sectionNumber;
-    private String text;
-
-    private boolean isTable;
-    private String headline;
-
-    private List<SectionArea> sectionAreas = new ArrayList<>();
-
-}
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}
@@ -7,13 +7,12 @@ import lombok.NoArgsConstructor;

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

-    private String id;
-    private String user;
-    private Status status;
-    private boolean removeFromDictionary;
+    private String dossierId;
+    private String fileId;
+
+}

-}
@@ -1,14 +1,9 @@
 package com.iqser.red.service.redaction.v1.resources;

-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
-
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,33 +11,29 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

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

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

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

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

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

-}
+
+    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
+
+
+    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
+                                        @PathVariable("fileId") String fileId,
+                                        @RequestBody ManualRedactions manualRedactions);
+
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.resources;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface RuleBuilderResource {
+
+    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
+    RuleBuilderModel getRuleBuilderModel();
+
+}
@@ -11,37 +11,76 @@

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

+    <properties>
+        <drools.version>7.68.0.Final</drools.version>
+        <kie.version>7.68.0.Final</kie.version>
+        <locationtech.version>1.18.2</locationtech.version>
+        <javaassist.version>3.28.0-GA</javaassist.version>
+        <ahocorasick.version>0.6.3</ahocorasick.version>
+        <jackson.version>2.13.2</jackson.version>
+    </properties>
+
    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>storage-commons</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-afterburner</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javaassist.version}</version>
+        </dependency>
+
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.2.9</version>
-        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${drools.version}</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${kie.version}</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
            <artifactId>jts-core</artifactId>
-            <version>1.16.1</version>
+            <version>${locationtech.version}</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
        </dependency>
+
        <!-- commons -->
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -56,10 +95,6 @@
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -74,6 +109,11 @@
            <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>
@@ -89,6 +129,18 @@

    <build>
        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+
            <plugin>
                <!-- generate git.properties for exposure in /info -->
                <groupId>pl.project13.maven</groupId>
@@ -1,16 +1,19 @@
 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.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.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;

@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@@ -19,8 +22,14 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin
 public class Application {

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

+    @Bean
+    public TimedAspect timedAspect(MeterRegistry registry) {
+        return new TimedAspect(registry);
+    }

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

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

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

 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,17 +18,14 @@ public class Document {
    private List<Header> headers = new ArrayList<>();
    private List<Footer> footers = new ArrayList<>();
    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
-    private Map<Integer, List<Entity>> entities = new HashMap<>();
    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter= new FloatFrequencyCounter();
-    private StringFrequencyCounter fontCounter= new StringFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
    private boolean headlines;

-    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
-    private long dictionaryVersion;
+    private DictionaryVersion dictionaryVersion;
    private long rulesVersion;

-    private List<SectionText> sectionText = new ArrayList<>();
 }
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

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

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

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

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

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

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


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


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

-import java.util.List;
-
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;

+import java.util.List;
+
@Data
@AllArgsConstructor
 public class Footer {

    private List<TextBlock> textBlocks;

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

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

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

-import java.util.List;
-
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;

+import java.util.List;
+
@Data
@AllArgsConstructor
 public class Header {

    private List<TextBlock> textBlocks;

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

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

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

-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
+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.ArrayList;
+import java.util.List;
+
@Data
@RequiredArgsConstructor
 public class Page {
@@ -17,7 +17,7 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

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

    private Rectangle bodyTextFrame;

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

+    private double cropBoxArea;
+
+
    public boolean isRotated() {
+
        return rotation != 0;
    }

-}
+}
@@ -1,20 +1,21 @@
 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;

-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;
-
@Data
@NoArgsConstructor
-public class Paragraph {
+public class Paragraph implements Comparable {

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


@@ -53,4 +54,11 @@ public class Paragraph {
        return textBlocks;
    }

-}
+
+    @Override
+    public int compareTo(Object o) {
+
+        return 0;
+    }
+
+}
@@ -0,0 +1,56 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.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
+@CompiledJson
+@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
+    @JsonAttribute(ignore = true)
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block != null) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedSectionText {
+
+    private int sectionNumber;
+    private String text;
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedText {
+
+    private int numberOfPages;
+    private List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
+
+}
@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

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

-import lombok.Getter;
-
 public class StringFrequencyCounter {

    @Getter
@@ -46,4 +46,4 @@ public class StringFrequencyCounter {
        return mostPopular != null ? mostPopular.getKey() : null;
    }

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

+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.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;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
@AllArgsConstructor
@Builder
@Data
+@CompiledJson
+@NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {

    @Builder.Default
@@ -30,6 +35,7 @@ public class TextBlock extends AbstractTextContainer {

    private String classification;

+
    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
        this.minX = minX;
        this.maxX = maxX;
@@ -98,7 +104,6 @@ public class TextBlock extends AbstractTextContainer {
    }


-
    @Override
    public String toString() {

@@ -118,6 +123,8 @@ public class TextBlock extends AbstractTextContainer {
    }

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

        StringBuilder sb = new StringBuilder();
@@ -139,4 +146,4 @@ public class TextBlock extends AbstractTextContainer {

    }

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

-import java.util.List;
-
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;

+import java.util.List;
+
@Data
@AllArgsConstructor
 public class UnclassifiedText {

    private List<TextBlock> textBlocks;

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

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

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

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

-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.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;
@@ -17,11 +15,24 @@ 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.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
@Service
@SuppressWarnings("all")
 public class BlockificationService {

-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    static final float THRESHOLD = 1f;
+
+
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
+                         List<Ruling> verticalRulingLines) {
+
+        sortRotatedSequences(textPositions);

        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -29,21 +40,42 @@ public class BlockificationService {
        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 || 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;
@@ -73,10 +105,66 @@ public class BlockificationService {
            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;
@@ -114,11 +202,19 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

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


-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {
+    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)) {
@@ -129,7 +225,8 @@ public class BlockificationService {
    }


-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter,
+                                            boolean landscape) {

        float minX = 10000;
        float maxX = -100;
@@ -206,4 +303,30 @@ public class BlockificationService {
        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
    }

+
+    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
+
+        List<TextPositionSequence> rotatedWords = new ArrayList<>();
+        Iterator<TextPositionSequence> itty = sequences.iterator();
+        while (itty.hasNext()) {
+            var pos = itty.next();
+            if (pos.getTextPositions().get(0).getDir() == 270) {
+                rotatedWords.add(pos);
+                itty.remove();
+            }
+        }
+
+        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
+            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
+        sequences.addAll(rotatedWords);
+    }
+
+
+    private double round(float value, int decimalPoints) {
+
+        var d = Math.pow(10, decimalPoints);
+        return Math.round(value * d) / d;
+    }
+
 }
@@ -1,19 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.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
@@ -54,7 +52,7 @@ public class ClassificationService {
                              List<Float> headlineFontSizes) {

        if (document.getFontSizeCounter().getMostPopular() == null) {
-            // TODO Figure out why this happens.
+            textBlock.setClassification("Other");
            return;
        }
        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
@@ -75,8 +73,10 @@ public class ClassificationService {
            }
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle()
+                .equals("bold") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -88,7 +88,7 @@ public class ClassificationService {
                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
                .equals("bold") && !document.getFontStyleCounter()
                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
@@ -2,7 +2,6 @@ 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
@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.client;

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

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

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

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

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

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

@Slf4j
@RestControllerAdvice
@@ -38,4 +37,11 @@ public class ControllerAdvice {
        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
    }

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

-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.Text;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
 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.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.*;
 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.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.List;
+import java.util.stream.Collectors;

@Slf4j
@RestController
@@ -46,82 +31,31 @@ import java.util.List;
 public class RedactionController implements RedactionResource {

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

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

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

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

-            log.info("Document structure analysis successful, starting redaction analysis...");
+                pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);

-            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
-            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
-                    .getRuleSetId());
+                return convert(pdDocument, classifiedDoc.getPages().size());

-            log.info("Redaction analysis successful...");
-
-            return AnalyzeResult.builder()
-                    .sectionGrid(classifiedDoc.getSectionGrid())
-                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
-                            .getRulesVersion(), analyzeRequest.getRuleSetId()))
-                    .numberOfPages(classifiedDoc.getPages().size())
-                    .text(new Text(classifiedDoc.getSectionText()))
-                    .build();
-
-        } catch (Exception e) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    public ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest) {
-
-        return reanalyzeService.reanalyze(renalyzeRequest);
-    }
-
-
-    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {
-
-            pdDocument.setAllSecurityToBeRemoved(true);
-            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
-            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());
-
-            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-                pdDocument.save(byteArrayOutputStream);
-                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
+            } catch (IOException e) {
+                throw new RedactionException(e);
            }

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

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

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

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

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -150,34 +91,27 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {

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

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


@@ -188,26 +122,35 @@ public class RedactionController implements RedactionResource {
    }


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

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


-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities, SectionGrid sectionGrid,
-                                    long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {
+    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)
-                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
-                    .sectionGrid(sectionGrid)
                    .build();
        }

    }

+
+    @Override
+    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
+                                               @PathVariable("fileId") String fileId,
+                                               @RequestBody ManualRedactions manualRedactions) {
+
+        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
+        log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());
+        return result.getManualRedactions();
+    }
+
 }
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.controller;
+
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
+import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class RuleBuilderController implements RuleBuilderResource {
+
+    private final RuleBuilderModelService ruleBuilderModelService;
+
+    @Override
+    public RuleBuilderModel getRuleBuilderModel() {
+        return ruleBuilderModelService.getRuleBuilderModel();
+    }
+
+}
@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+}
@@ -0,0 +1,389 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.iqser.red.service.redaction.v1.server.parsing;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.fontbox.ttf.TrueTypeFont;
+import org.apache.fontbox.util.BoundingBox;
+
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDCIDFont;
+import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
+import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
+import org.apache.pdfbox.text.TextPosition;
+import org.apache.pdfbox.util.Matrix;
+import org.apache.pdfbox.util.Vector;
+import org.apache.pdfbox.contentstream.operator.DrawObject;
+import org.apache.pdfbox.contentstream.operator.state.Concatenate;
+import org.apache.pdfbox.contentstream.operator.state.Restore;
+import org.apache.pdfbox.contentstream.operator.state.Save;
+import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
+import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
+import org.apache.pdfbox.contentstream.operator.text.BeginText;
+import org.apache.pdfbox.contentstream.operator.text.EndText;
+import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
+import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
+import org.apache.pdfbox.contentstream.operator.text.MoveText;
+import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
+import org.apache.pdfbox.contentstream.operator.text.NextLine;
+import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
+import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
+import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
+import org.apache.pdfbox.contentstream.operator.text.ShowText;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
+
+/**
+ * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
+ *
+ * This class exists only so that we don't break the code of users who have their own subclasses of
+ * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
+ * with a heuristic implementation which is backwards compatible.
+ *
+ * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+ * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
+ */
+@SuppressWarnings({"PMD", "checkstyle:all"})
+class LegacyPDFStreamEngine extends PDFStreamEngine
+{
+    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
+
+    private int pageRotation;
+    private PDRectangle pageSize;
+    private Matrix translateMatrix;
+    private final GlyphList glyphList;
+    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
+
+    /**
+     * Constructor.
+     */
+    LegacyPDFStreamEngine() throws IOException
+    {
+        addOperator(new BeginText());
+        addOperator(new Concatenate());
+        addOperator(new DrawObject()); // special text version
+        addOperator(new EndText());
+        addOperator(new SetGraphicsStateParameters());
+        addOperator(new Save());
+        addOperator(new Restore());
+        addOperator(new NextLine());
+        addOperator(new SetCharSpacing());
+        addOperator(new MoveText());
+        addOperator(new MoveTextSetLeading());
+        addOperator(new SetFontAndSize());
+        addOperator(new ShowText());
+        addOperator(new ShowTextAdjusted());
+        addOperator(new SetTextLeading());
+        addOperator(new SetMatrix());
+        addOperator(new SetTextRenderingMode());
+        addOperator(new SetTextRise());
+        addOperator(new SetWordSpacing());
+        addOperator(new SetTextHorizontalScaling());
+        addOperator(new ShowTextLine());
+        addOperator(new ShowTextLineAndSpace());
+
+        // load additional glyph list for Unicode mapping
+        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
+        InputStream input = GlyphList.class.getResourceAsStream(path);
+        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
+    }
+
+    /**
+     * This will initialize and process the contents of the stream.
+     *
+     * @param page the page to process
+     * @throws java.io.IOException if there is an error accessing the stream.
+     */
+    @Override
+    public void processPage(PDPage page) throws IOException
+    {
+        this.pageRotation = page.getRotation();
+        this.pageSize = page.getCropBox();
+
+        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0)
+        {
+            translateMatrix = null;
+        }
+        else
+        {
+            // translation matrix for cropbox
+            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
+        }
+        super.processPage(page);
+    }
+
+    /**
+     * Called when a glyph is to be processed. The heuristic calculations here were originally
+     * written by Ben Litchfield for PDFStreamEngine.
+     */
+    @Override
+    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code,
+            String unicode,
+            Vector displacement)
+            throws IOException
+    {
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        PDGraphicsState state = getGraphicsState();
+        Matrix ctm = state.getCurrentTransformationMatrix();
+        float fontSize = state.getTextState().getFontSize();
+        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
+        Matrix textMatrix = getTextMatrix();
+
+        float displacementX = displacement.getX();
+        // the sorting algorithm is based on the width of the character. As the displacement
+        // for vertical characters doesn't provide any suitable value for it, we have to 
+        // calculate our own
+        if (font.isVertical())
+        {
+            displacementX = font.getWidth(code) / 1000;
+            // there may be an additional scaling factor for true type fonts
+            TrueTypeFont ttf = null;
+            if (font instanceof PDTrueTypeFont)
+            {
+                ttf = ((PDTrueTypeFont)font).getTrueTypeFont();
+            }
+            else if (font instanceof PDType0Font)
+            {
+                PDCIDFont cidFont = ((PDType0Font)font).getDescendantFont();
+                if (cidFont instanceof PDCIDFontType2)
+                {
+                    ttf = ((PDCIDFontType2)cidFont).getTrueTypeFont();
+                }
+            }
+            if (ttf != null && ttf.getUnitsPerEm() != 1000)
+            {
+                displacementX *= 1000f / ttf.getUnitsPerEm();
+            }
+        }
+
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        // (modified) combined displacement, this is calculated *without* taking the character
+        // spacing and word spacing into account, due to legacy code in TextStripper
+        float tx = displacementX * fontSize * horizontalScaling;
+        float ty = displacement.getY() * fontSize;
+
+        // (modified) combined displacement matrix
+        Matrix td = Matrix.getTranslateInstance(tx, ty);
+
+        // (modified) text rendering matrix
+        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
+        float nextX = nextTextRenderingMatrix.getTranslateX();
+        float nextY = nextTextRenderingMatrix.getTranslateY();
+
+        // (modified) width and height calculations
+        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
+        Float fontHeight = fontHeightMap.get(font.getCOSObject());
+        if (fontHeight == null)
+        {
+            fontHeight = computeFontHeight(font);
+            fontHeightMap.put(font.getCOSObject(), fontHeight);
+        }
+        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
+
+        //
+        // start of the original method
+        //
+
+        // Note on variable names. There are three different units being used in this code.
+        // Character sizes are given in glyph units, text locations are initially given in text
+        // units, and we want to save the data in display units. The variable names should end with
+        // Text or Disp to represent if the values are in text or disp units (no glyph units are
+        // saved).
+
+        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
+        if (font instanceof PDType3Font)
+        {
+            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
+        }
+
+        float spaceWidthText = 0;
+        try
+        {
+            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
+            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
+        }
+        catch (Throwable exception)
+        {
+            LOG.warn(exception, exception);
+        }
+
+        if (spaceWidthText == 0)
+        {
+            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
+            // the average space width appears to be higher than necessary so make it smaller
+            spaceWidthText *= .80f;
+        }
+        if (spaceWidthText == 0)
+        {
+            spaceWidthText = 1.0f; // if could not find font, use a generic value
+        }
+
+        // the space width has to be transformed into display units
+        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
+
+        // use our additional glyph list for Unicode mapping
+        String unicodeMapping = font.toUnicode(code, glyphList);
+
+        // when there is no Unicode mapping available, Acrobat simply coerces the character code
+        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
+        // this, which is why we leave it until this point in PDFTextStreamEngine.
+        if (unicodeMapping == null)
+        {
+            if (font instanceof PDSimpleFont)
+            {
+                char c = (char) code;
+                unicodeMapping = new String(new char[] { c });
+            }
+            else
+            {
+                // Acrobat doesn't seem to coerce composite font's character codes, instead it
+                // skips them. See the "allah2.pdf" TestTextStripper file.
+                return;
+            }
+        }
+
+        // adjust for cropbox if needed
+        Matrix translatedTextRenderingMatrix;
+        if (translateMatrix == null)
+        {
+            translatedTextRenderingMatrix = textRenderingMatrix;
+        }
+        else
+        {
+            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
+            nextX -= pageSize.getLowerLeftX();
+            nextY -= pageSize.getLowerLeftY();
+        }
+
+        // This is a hack for unicode letter with 2 chars e.g. RA see unicodeProblem.pdf
+        if(unicodeMapping.length() == 2){
+            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
+                    pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
+                    Math.abs(dyDisplay), dxDisplay,
+                    Math.abs(spaceWidthDisplay), Character.toString(unicodeMapping.charAt(0)), new int[] { code }, font,
+                    fontSize,
+                    (int)(fontSize * textMatrix.getScalingFactorX())));
+            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
+                    pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
+                    Math.abs(dyDisplay), dxDisplay,
+                    Math.abs(spaceWidthDisplay), Character.toString(unicodeMapping.charAt(1)), new int[] { code }, font,
+                    fontSize,
+                    (int)(fontSize * textMatrix.getScalingFactorX())));
+        } else {
+
+            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(), pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY, Math.abs(dyDisplay), dxDisplay, Math.abs(spaceWidthDisplay), unicodeMapping, new int[]{code}, font, fontSize, (int) (fontSize * textMatrix.getScalingFactorX())));
+        }
+    }
+
+    /**
+     * Compute the font height. Override this if you want to use own calculations.
+     * 
+     * @param font the font.
+     * @return the font height.
+     * 
+     * @throws IOException if there is an error while getting the font bounding box.
+     */
+    protected float computeFontHeight(PDFont font) throws IOException
+    {
+        BoundingBox bbox = font.getBoundingBox();
+        if (bbox.getLowerLeftY() < Short.MIN_VALUE)
+        {
+            // PDFBOX-2158 and PDFBOX-3130
+            // files by Salmat eSolutions / ClibPDF Library
+            bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536));
+        }
+        // 1/2 the bbox is used as the height todo: why?
+        float glyphHeight = bbox.getHeight() / 2;
+
+        // sometimes the bbox has very high values, but CapHeight is OK
+        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
+        if (fontDescriptor != null)
+        {
+            float capHeight = fontDescriptor.getCapHeight();
+            if (Float.compare(capHeight, 0) != 0 &&
+                    (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0))
+            {
+                glyphHeight = capHeight;
+            }
+            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
+            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
+            float ascent = fontDescriptor.getAscent();
+            float descent = fontDescriptor.getDescent();
+            if (capHeight > ascent && ascent > 0 && descent < 0 &&
+                    ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0))
+            {
+                glyphHeight = (ascent - descent) / 2;
+            }
+        }
+
+        // transformPoint from glyph space -> text space
+        float height;
+        if (font instanceof PDType3Font)
+        {
+            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
+        }
+        else
+        {
+            height = glyphHeight / 1000;
+        }
+
+        return height;
+    }
+
+    /**
+     * A method provided as an event interface to allow a subclass to perform some specific
+     * functionality when text needs to be processed.
+     *
+     * @param text The text to be processed.
+     */
+    protected void processTextPosition(TextPosition text)
+    {
+        // subclasses can override to provide specific functionality
+    }
+}
@@ -1,17 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

-import org.apache.pdfbox.text.PDFTextStripperByArea;
-import org.apache.pdfbox.text.TextPosition;
-
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.Getter;
-import lombok.Setter;
-
 public class PDFAreaTextStripper extends PDFTextStripperByArea {

    @Getter
@@ -48,6 +46,17 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
                startIndex = i;
            }

+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
@@ -76,7 +85,7 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
    }


-    public void clearPositions(){
+    public void clearPositions() {
        textPositionSequences = new ArrayList<>();
    }

@@ -1,80 +1,45 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import java.awt.geom.AffineTransform;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
+import org.apache.pdfbox.contentstream.operator.color.*;
+import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.text.TextPosition;
+
 import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

-import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
-import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
-import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
-import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
-import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
-import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
-import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
-import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.graphics.PDXObject;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.text.PDFTextStripper;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.pdfbox.util.Matrix;
-
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-
@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {

-    @Setter
-    protected PDPage pdpage;
-
-    @Getter
-    private int minCharWidth;
-
-    @Getter
-    private int maxCharWidth;
-    
-    @Getter
-    private int minCharHeight;
-
-    @Getter
-    private int maxCharHeight;
-
    @Getter
    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-
    @Getter
    private final List<Ruling> rulings = new ArrayList<>();
-
    private final List<Ruling> graphicsPath = new ArrayList<>();
-
+    @Setter
+    protected PDPage pdpage;
    @Getter
-    private List<Rectangle2D> imageBounds = new ArrayList<>();
+    private int minCharWidth;
+    @Getter
+    private int maxCharWidth;
+    @Getter
+    private int minCharHeight;
+    @Getter
+    private int maxCharHeight;

    private float path_x;
    private float path_y;
@@ -131,11 +96,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {

                    // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                    if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
-                                .getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
-                                .getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
                    }

                    path_x = (float) pos.getX();
@@ -156,25 +119,19 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                    Point2D p2 = transformPosition(x + width, y + height);

                    // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
-                            .getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
-                            .getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));

                    // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
-                                .getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
-                                .getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
                    }
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
-                                .getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
-                                .getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
                    }
                }
                break;
@@ -198,9 +155,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                graphicsPath.clear();
                break;

-            case OperatorName.DRAW_OBJECT:
-                processImageOperation(arguments);
-                break;

        }

@@ -208,46 +162,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


-    protected void processImageOperation(List<COSBase> arguments) {
-
-        try {
-            COSName objectName = (COSName) arguments.get(0);
-            PDXObject xobject = getResources().getXObject(objectName);
-            if (xobject instanceof PDImageXObject) {
-                PDImageXObject pdfImage = (PDImageXObject) xobject;
-
-                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
-
-                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
-                        .getWidth(), (float) imageBounds.getHeight());
-
-                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.imageBounds.add(rect);
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Problem during image extraction: {}", e.getMessage());
-        }
-    }
-
-
-    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
-
-        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
-
-        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
-
-        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
-        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
-        imageTransform.translate(0, -pdfImage.getHeight());
-
-        AffineTransform pageTransform = new AffineTransform();
-        pageTransform.concatenate(imageTransform);
-
-        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
-    }
-
-
    private float floatValue(COSBase value) {

        if (value instanceof COSNumber) {
@@ -273,7 +187,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                rulings.addAll(path);
            }
        } catch (UnsupportedOperationException e) {
-            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
+            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
                    .getColorSpace()
                    .getName() + " or " + getGraphicsState().getNonStrokingColor()
                    .getColorSpace()
@@ -286,8 +200,16 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
+        RedTextPosition previous = null;
+
        for (int i = 0; i <= textPositions.size() - 1; i++) {

+            if (!textPositionSequences.isEmpty()) {
+                previous = textPositionSequences.get(textPositionSequences.size() - 1)
+                        .getTextPositions()
+                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
+            }
+
            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
            if (charWidth < minCharWidth) {
                minCharWidth = charWidth;
@@ -306,17 +228,32 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0"))) {
+                    .equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
                startIndex++;
                continue;
            }

            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
+                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
@@ -324,12 +261,25 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
+
+                    // Remove false sequence ends (whitespaces)
+                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                        for (TextPosition t : sublist) {
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                        }
+                    } else {
+                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                    }
                }
                startIndex = i + 1;
            }
@@ -338,13 +288,23 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
+
        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                .getUnicode()
-                .equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                .equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                for (TextPosition t : sublist) {
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                }
+            } else {
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+            }
        }
        super.writeString(text);
    }
@@ -358,7 +318,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        minCharHeight = Integer.MAX_VALUE;
        maxCharHeight = 0;
        textPositionSequences.clear();
-        imageBounds = new ArrayList<>();
        rulings.clear();
        graphicsPath.clear();
        path_x = 0.0f;
@@ -368,4 +327,4 @@ public class PDFLinesTextStripper extends PDFTextStripper {

    }

-}
+}
@@ -1,24 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.awt.geom.Rectangle2D;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class ParsedElements {
-
-    private List<TextPositionSequence> sequences;
-    private List<Ruling> rulings;
-    private List<Rectangle2D> imageBounds;
-
-    private boolean landscape;
-    private boolean rotated;
-
-    private float minCharWidth;
-    private float maxCharWidth;
-}
@@ -0,0 +1,83 @@
+package com.iqser.red.service.redaction.v1.server.parsing.model;
+
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.beans.BeanUtils;
+
+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@CompiledJson
+public class RedTextPosition {
+
+    private String textMatrix;
+    private int rotation;
+    private float y;
+    private float pageHeight;
+    private float pageWidth;
+    private String unicode;
+
+    @JsonAlias("xdirAdj")
+    @JsonAttribute(alternativeNames = {"xdirAdj"})
+    private float XDirAdj;
+
+    @JsonAlias("ydirAdj")
+    @JsonAttribute(alternativeNames = {"ydirAdj"})
+    private float YDirAdj;
+    private float width;
+    private float heightDir;
+    private float widthDirAdj;
+    private float dir;
+
+    // not used in reanalysis
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private float widthOfSpace;
+
+    // not used in reanalysis
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private float fontSizeInPt;
+
+    // not used in reanalysis
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private String fontName;
+
+
+    @SneakyThrows
+    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
+        var pos = new RedTextPosition();
+        BeanUtils.copyProperties(textPosition, pos);
+        pos.setFontName(textPosition.getFont().getName());
+
+        pos.setFontSizeInPt(textPosition.getFontSizeInPt());
+
+        pos.setTextMatrix(textPosition.getTextMatrix().toString());
+
+        return pos;
+    }
+
+
+    @JsonAlias("xdirAdj")
+    @JsonAttribute(alternativeNames = {"xdirAdj"})
+    public void setXDirAdj(float XDirAdj) {this.XDirAdj = XDirAdj;}
+
+
+    @JsonAlias("ydirAdj")
+    @JsonAttribute(alternativeNames = {"ydirAdj"})
+    public void setYDirAdj(float YDirAdj) {this.YDirAdj = YDirAdj;}
+
+
+}
@@ -2,27 +2,58 @@ package com.iqser.red.service.redaction.v1.server.parsing.model;

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

 import org.apache.pdfbox.text.TextPosition;

+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;

+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-import lombok.RequiredArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Data
-@RequiredArgsConstructor
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {

-    private List<TextPosition> textPositions = new ArrayList<>();
+    private int page;
+    private List<RedTextPosition> textPositions = new ArrayList<>();

-    private final int page;
+    private float x1;
+    private float x2;
+
+
+    public TextPositionSequence(int page) {
+
+        this.page = page;
+    }
+
+
+    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
+
+        var textPositionSequence = new TextPositionSequence();
+        textPositionSequence.textPositions = textPositions;
+        textPositionSequence.page = page;
+
+        return textPositionSequence;
+    }


    public TextPositionSequence(List<TextPosition> textPositions, int page) {

-        this.textPositions = textPositions;
+        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
        this.page = page;
    }

@@ -37,7 +68,7 @@ public class TextPositionSequence implements CharSequence {
    @Override
    public char charAt(int index) {

-        TextPosition textPosition = textPositionAt(index);
+        RedTextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return text.charAt(0);
    }
@@ -45,7 +76,7 @@ public class TextPositionSequence implements CharSequence {

    public char charAt(int index, boolean caseInSensitive) {

-        TextPosition textPosition = textPositionAt(index);
+        RedTextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
    }
@@ -54,7 +85,7 @@ public class TextPositionSequence implements CharSequence {
    @Override
    public TextPositionSequence subSequence(int start, int end) {

-        return new TextPositionSequence(textPositions.subList(start, end), page);
+        return fromData(textPositions.subList(start, end), page);
    }


@@ -69,18 +100,26 @@ public class TextPositionSequence implements CharSequence {
    }


-    public TextPosition textPositionAt(int index) {
+    public RedTextPosition textPositionAt(int index) {

        return textPositions.get(index);
    }


-    public void add(TextPosition textPosition) {
+    public void add(RedTextPosition textPosition) {

        this.textPositions.add(textPosition);
    }


+    public void add(TextPosition textPosition) {
+
+        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getX1() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -91,23 +130,36 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getX2() {

        if (textPositions.get(0).getRotation() == 90) {
            return textPositions.get(0).getYDirAdj();
        } else {
-            return textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+            return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
        }
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getRotationAdjustedY() {

        return textPositions.get(0).getY();
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getY1() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -118,6 +170,8 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getY2() {

        if (textPositions.get(0).getRotation() == 90) {
@@ -128,38 +182,43 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getTextHeight() {

        return textPositions.get(0).getHeightDir() + 2;
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getHeight() {

        return getY2() - getY1();
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getWidth() {

        return getX2() - getX1();
    }


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

-        return textPositions.get(0)
-                .getFont()
-                .toString()
-                .toLowerCase()
-                .replaceAll(",bold", "")
-                .replaceAll(",italic", "");
+        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
    }


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

-        String lowercaseFontName = textPositions.get(0).getFont().toString().toLowerCase();
+        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();

        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
            return "bold, italic";
@@ -174,26 +233,36 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getFontSize() {

        return textPositions.get(0).getFontSizeInPt();
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getSpaceWidth() {

        return textPositions.get(0).getWidthOfSpace();
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public int getRotation() {

        return textPositions.get(0).getRotation();
    }


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public Rectangle getRectangle() {

+        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, this, textPositions.get(0).getRotation(), textPositions.get(0).getDir());
+
        float height = getTextHeight();

        float posXInit = getX1();
@@ -201,26 +270,118 @@ public class TextPositionSequence implements CharSequence {
        float posYInit;
        float posYEnd;

-        if (textPositions.get(0).getRotation() == 90) {
+        if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 180f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1).getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
+
+            posXInit = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1).getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 90.0f) {
            posXEnd = textPositions.get(0).getYDirAdj() + 2;
            posYInit = getY1();
            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-        } else if (textPositions.get(0).getRotation() == 270) {
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
-                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
-        } else {
-            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 180.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1).getXDirAdj() - 4;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getYDirAdj() - 2 - textPositions.get(textPositions.size() - 1).getHeightDir();
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - textPositions.get(textPositions.size() - 1).getHeightDir();
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 270.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1();
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posYInit = textPositions.get(0).getPageHeight() - getY1();
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1).getXDirAdj() - height - 4;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 0f) {
+
+            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1).getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 90f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() - 3;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 180f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 270.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj();
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1).getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = posYInit + 1;
+            posXInit = textPositions.get(0).getXDirAdj();
+            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 90.0f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() - height;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 180.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() - 4;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - height;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1).getYDirAdj() + height;
+
+        } else {
+            // page rotation = 0 and text direction = 0
+            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1).getYDirAdj() + 2;
        }

-        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        log.debug("Rectangle: {}", rectangle);
+        return rectangle;
    }

-}
+}
@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class MessageReceiver {
+
+    private final RedactionMessageReceiver redactionMessageReceiver;
+
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_QUEUE)
+    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
+        redactionMessageReceiver.receiveAnalyzeRequest(in, false);
+    }
+
+}
@@ -0,0 +1,62 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.QueueBuilder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RequiredArgsConstructor
+public class MessagingConfiguration {
+
+    public static final String REDACTION_QUEUE = "redactionQueue";
+    public static final String REDACTION_DQL = "redactionDQL";
+
+    public static final String REDACTION_PRIORITY_QUEUE = "redactionPriorityQueue";
+
+    @Bean
+    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false")
+    public MessageReceiver messageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+        return new MessageReceiver(redactionMessageReceiver);
+    }
+
+
+    @Bean
+    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "true")
+    public PriorityMessageReceiver priorityMessageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+        return new PriorityMessageReceiver(redactionMessageReceiver);
+    }
+
+
+    @Bean
+    public Queue redactionQueue() {
+
+        return QueueBuilder.durable(REDACTION_QUEUE)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
+                .maxPriority(2)
+                .build();
+    }
+
+
+    @Bean
+    public Queue redactionPriorityQueue() {
+
+        return QueueBuilder.durable(REDACTION_PRIORITY_QUEUE)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
+                .maxPriority(2)
+                .build();
+    }
+
+
+    @Bean
+    public Queue redactionDeadLetterQueue() {
+
+        return QueueBuilder.durable(REDACTION_DQL).build();
+    }
+
+}
@@ -0,0 +1,27 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_PRIORITY_QUEUE;
+
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+public class PriorityMessageReceiver {
+
+    private final RedactionMessageReceiver redactionMessageReceiver;
+
+
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_PRIORITY_QUEUE)
+    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
+
+        redactionMessageReceiver.receiveAnalyzeRequest(in, true);
+    }
+
+}
@@ -0,0 +1,85 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
+import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionMessageReceiver {
+
+    private final ObjectMapper objectMapper;
+    private final AnalyzeService analyzeService;
+    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
+
+
+    public void receiveAnalyzeRequest(String in, boolean priority) throws JsonProcessingException {
+
+        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
+        log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
+        AnalyzeResult result = null;
+
+        try {
+            switch (analyzeRequest.getMessageType()) {
+
+                case REANALYSE:
+                    result = analyzeService.reanalyze(analyzeRequest);
+                    log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;
+
+                case STRUCTURE_ANALYSE:
+                    result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+                    log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;
+
+                case ANALYSE:
+                    result = analyzeService.analyze(analyzeRequest);
+                    log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;
+
+                case SURROUNDING_TEXT:
+                    result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
+                    log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;
+
+                default:
+                    throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
+            }
+
+            result.setMessageType(analyzeRequest.getMessageType());
+            fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
+
+        } catch (Exception e) {
+            log.warn("Failed to process analyze request: {}", analyzeRequest, e);
+            fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        }
+    }
+
+
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_DQL)
+    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
+
+        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
+        log.info("Failed to process analyze request: {}", analyzeRequest);
+
+        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+    }
+
+}
@@ -1,22 +1,25 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import java.util.Iterator;
-import java.util.List;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;

-import lombok.Value;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;

-@Value
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class CellValue {

-    private List<TextBlock> textBlocks;
+    private List<TextBlock> textBlocks = new ArrayList<>();

    private int rowSpanStart;

-
    @Override
    public String toString() {

@@ -47,4 +50,4 @@ public class CellValue {
                .replaceAll(" {2}", " ");
    }

-}
+}
@@ -11,41 +11,31 @@ import lombok.Getter;
@Data
 public class Dictionary {

-    public static final String RECOMMENDATION_PREFIX = "recommendation_";
-
    @Getter
    private List<DictionaryModel> dictionaryModels;
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();

    @Getter
-    private long version;
+    private DictionaryVersion version;


-    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
+
        this.dictionaryModels = dictionaryModels;
        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
-        this.version = dictionaryVersion;
+        this.version = version;
    }


-    public int getDictionaryRank(String type){
-        if(!localAccessMap.containsKey(type)){
+    public int getDictionaryRank(String type) {
+
+        if (!localAccessMap.containsKey(type)) {
            return 0;
        }
        return localAccessMap.get(type).getRank();
    }


-    public boolean isRecommendation(String type) {
-
-        DictionaryModel model = localAccessMap.get(type);
-        if (model != null) {
-            return model.isRecommendation();
-        }
-        return false;
-    }
-
-
    public boolean hasLocalEntries() {

        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
@@ -58,20 +48,9 @@ public class Dictionary {
    }


-    public boolean containsValue(String type, String value) {
+    public DictionaryModel getType(String type) {

-        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getEntries()
-                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getLocalEntries()
-                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getEntries()
-                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getLocalEntries()
-                .contains(value)) {
-            return true;
-        }
-        return false;
+        return localAccessMap.get(type);
    }


@@ -84,6 +63,7 @@ public class Dictionary {
        return false;
    }

+
    public boolean isCaseInsensitiveDictionary(String type) {

        DictionaryModel dictionaryModel = localAccessMap.get(type);
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictionaryEntries {
+
+    @Builder.Default
+    Set<DictionaryEntry> entries = new HashSet<>();
+    @Builder.Default
+    Set<DictionaryEntry> falsePositives = new HashSet<>();
+    @Builder.Default
+    Set<DictionaryEntry> falseRecommendations = new HashSet<>();
+
+}
@@ -1,15 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import java.util.Set;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;

+import java.util.Set;
+
@Data
@AllArgsConstructor
 public class DictionaryIncrement {

    private Set<DictionaryIncrementValue> values;
-    private long dictionaryVersion;
+    private DictionaryVersion dictionaryVersion;

 }
@@ -1,31 +1,91 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;


+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;

-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;

@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {

-    private String type;
-    private int rank;
-    private float[] color;
-    private boolean caseInsensitive;
-    private boolean hint;
-    private boolean recommendation;
-    private Set<DictionaryEntry> entries;
-    private Set<String> localEntries;
+    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<DictionaryEntry> entries;
+    private final Set<DictionaryEntry> falsePositives;
+    private final Set<DictionaryEntry> falseRecommendations;
+
+    private transient SearchImplementation entriesSearch;
+    private transient SearchImplementation falsePositiveSearch;
+    private transient SearchImplementation falseRecommendationsSearch;
+    private transient SearchImplementation localSearch;
+
+    private final Set<String> localEntries = new HashSet<>();
+
+    public DictionaryModel(String type,
+                           int rank,
+                           float[] color,
+                           boolean caseInsensitive,
+                           boolean hint,
+                           Set<DictionaryEntry> entries,
+                           Set<DictionaryEntry> falsePositives,
+                           Set<DictionaryEntry> 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(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+        this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);

-    public Set<String> getValues(boolean local){
-        return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e-> e.getValue()).collect(Collectors
-                .toSet());
    }

+    public SearchImplementation getLocalSearch() {
+        if (this.localSearch == null) {
+            this.localSearch = new SearchImplementation(this.localEntries, 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;
+    }
+
+
 }
@@ -10,7 +10,7 @@ import java.util.Map;
@Data
 public class DictionaryRepresentation {

-    private String ruleSetId;
+    private String dossierTemplateId;
    private long dictionaryVersion = -1;
    private List<DictionaryModel> dictionary = new ArrayList<>();
    private float[] defaultColor;
@@ -20,5 +20,4 @@ public class DictionaryRepresentation {
    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();


-
 }
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictionaryVersion {
+
+    long dossierTemplateVersion;
+    long dossierVersion;
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Entities {
+
+    @Builder.Default
+    private Set<Entity> entities = new HashSet<>();
+
+    @Builder.Default
+    private Set<Entity> nerEntities = new HashSet<>();
+
+}
@@ -1,20 +1,28 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

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

+import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;

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

@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity {
+public class Entity implements ReasonHolder {

-
-    private final String word;
-    private final String type;
+    private String word;
+    private String type;
    private boolean redaction;
    private String redactionReason;
    private String legalBasis;
@@ -38,8 +46,23 @@ public class Entity {
    private String textBefore;
    private String textAfter;

+    private boolean isDossierDictionaryEntry;

-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end) {
+    private boolean ignored;
+
+    private Set<Engine> engines = new HashSet<>();
+
+    private Set<Entity> references = new HashSet<>();
+
+    private EntityType entityType;
+
+    private boolean resized;
+
+
+    public Entity(String word, String type, boolean redaction, String redactionReason,
+                  List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,
+                  String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start,
+                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references, EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -55,10 +78,15 @@ public class Entity {
        this.textAfter = textAfter;
        this.start = start;
        this.end = end;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
+        this.engines = engines;
+        this.references = references;
+        this.entityType = entityType;
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine, EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -67,6 +95,10 @@ public class Entity {
        this.headline = headline;
        this.sectionNumber = sectionNumber;
        this.isDictionaryEntry = isDictionaryEntry;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
+        this.engines.add(engine);
+        this.entityType = entityType;
    }

+
 }
@@ -6,19 +6,21 @@ import java.util.List;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;

 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;

@Data
+@Builder
@RequiredArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
 public class EntityPositionSequence {

+    private final String id;
    @EqualsAndHashCode.Exclude
    private List<TextPositionSequence> sequences = new ArrayList<>();
    private int pageNumber;
-    private final String id;

 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public enum EntityType {
+    ENTITY, RECOMMENDATION, FALSE_POSITIVE, FALSE_RECOMMENDATION
+}
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import com.dslplatform.json.CompiledJson;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class Image implements ReasonHolder {
+
+    private String type;
+    private RedRectangle2D position;
+    private boolean redaction;
+    private String redactionReason;
+    private String legalBasis;
+    private int matchedRule;
+    private int sectionNumber;
+    private String section;
+    private int page;
+    private boolean ignored;
+    private boolean hasTransparency;
+
+}
--- a/Show More
+++ b/Show More