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

2022-07-26 13:35:20 +02:00 · 2022-07-26 13:25:58 +02:00 · 2022-07-26 13:22:34 +02:00 · 2022-07-26 13:10:59 +02:00 · 2022-07-26 13:03:16 +02:00 · 2022-07-26 08:54:20 +02:00
296 changed files with 118179 additions and 3255 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>8.0.3</version>
+    <version>8.1.3</version>
    <relativePath/>
  </parent>

@@ -1,10 +1,12 @@
 package buildjob;

-import java.time.DayOfWeek;
+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;
@@ -17,19 +19,16 @@ 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.RepositoryPollingTrigger;
 import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.util.BambooServer;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
-
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
+import com.atlassian.bamboo.specs.util.BambooServer;

 /**
 * Plan configuration for Bamboo.
@@ -40,14 +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 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");

@@ -56,15 +56,21 @@ public class PlanSpec {
        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)
+
+        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)
@@ -72,103 +78,80 @@ public class PlanSpec {
        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")
-                                                .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.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 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")
-                                                .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.6.2-jdk-13-3.0.0")
-                                                .dockerRunArguments("--net=host")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
+
+    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(12, 00)),
-                        new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranchMatching("release.*")
-                        .notificationForCommitters());
+                .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());
+    }
+
 }
@@ -3,49 +3,62 @@ set -e

 SERVICE_NAME=$1

-if [[ "${bamboo_version_tag}" = "dev" ]]
-then 
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+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
-else        
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        versions:set \
-        -DnewVersion=${bamboo_version_tag}
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-        versions:set  \
-        -DnewVersion=${bamboo_version_tag}
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        clean deploy \
-        -e \
-        -DdeployAtEnd=true \
-        -Dmaven.wagon.http.ssl.insecure=true \
-        -Dmaven.wagon.http.ssl.allowall=true \
-        -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
-        -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
+    echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
+    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
+    exit 0
 fi

-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+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

-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    --no-transfer-progress \
+mvn --no-transfer-progress \
    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
    docker:push
-
-if [[ "${bamboo_version_tag}" = "dev" ]]
-then 
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-else
-    echo "gitTag=${bamboo_version_tag}" > git.tag
-fi
@@ -3,46 +3,42 @@ set -e

 SERVICE_NAME=$1

-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+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"
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    --no-transfer-progress \
+mvn --no-transfer-progress \
    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
    org.owasp:dependency-check-maven:aggregate

 if [[ -z "${bamboo_repository_pr_key}" ]]
 then
    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-            --no-transfer-progress \
-            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-            sonar:sonar \
-            -Dsonar.projectKey=RED_$SERVICE_NAME \
-            -Dsonar.host.url=https://sonarqube.iqser.com \
-            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-            -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-            
+    mvn --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        sonar:sonar \
+        -Dsonar.projectKey=RED_$SERVICE_NAME \
+        -Dsonar.host.url=https://sonarqube.iqser.com \
+        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
+        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
 else
    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-            --no-transfer-progress \
-            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-            sonar:sonar \
-            -Dsonar.projectKey=RED_$SERVICE_NAME \
-            -Dsonar.host.url=https://sonarqube.iqser.com \
-            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-            -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-            -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-            -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi
+    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,9 +10,13 @@ import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
 public class PlanSpecTest {
    @Test
    public void checkYourPlanOffline() throws PropertiesValidationException {
+
        Plan plan = new PlanSpec().createPlan();
        EntityPropertiesBuilders.build(plan);

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

    <artifactId>redaction-service</artifactId>
    <groupId>com.iqser.red.service</groupId>
-    <version>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,7 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -42,7 +42,7 @@
                <artifactId>docker-maven-plugin</artifactId>
            </plugin>
        </plugins>
-        
+
        <pluginManagement>
            <plugins>
                <plugin>
@@ -95,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.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.6.0</version>
+        <version>1.10.0</version>
        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -23,20 +23,19 @@

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


    <dependencyManagement>
-
        <dependencies>
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.7.0</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,7 @@
                <artifactId>pdfbox-tools</artifactId>
                <version>${pdfbox.version}</version>
            </dependency>
-
        </dependencies>
-
    </dependencyManagement>

    <build>
@@ -58,12 +55,10 @@
                <plugin>
                    <groupId>org.sonarsource.scanner.maven</groupId>
                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.0.2155</version>
-                    </plugin>                    
+                    </plugin>
                <plugin>
                    <groupId>org.owasp</groupId>
                    <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
                    <configuration>
                        <format>ALL</format>
                    </configuration>
@@ -88,27 +83,5 @@
                </plugin>
            </plugins>
        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
-                <executions>
-                    <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>report</id>
-                        <goals>
-                            <goal>report-aggregate</goal>
-                        </goals>
-                        <phase>verify</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
    </build>
 </project>
@@ -12,19 +12,50 @@
    <artifactId>redaction-service-api-v1</artifactId>

    <properties>
-        <persistence-service.version>1.23.0</persistence-service.version>
+        <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,8 +1,6 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImportedAnnotation;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -37,8 +35,5 @@ public class AnalyzeRequest {
    @Builder.Default
    private List<FileAttribute> fileAttributes = new ArrayList<>();

-    @Builder.Default
-    List<ImportedAnnotation> importedAnnotations = new ArrayList<>();
-
 }

@@ -1,7 +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;
@@ -1,12 +1,12 @@
 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
@@ -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<>();
+}
@@ -20,27 +20,29 @@ public class ManualChange {
    private AnnotationStatus annotationStatus;
    private ManualRedactionType manualRedactionType;
    private OffsetDateTime processedDate;
+    private OffsetDateTime requestedDate;
    private String userId;
-    private Map<String, Object> propertyChanges = new HashMap<>();
-
-    public boolean isProcessed() {
-        return processedDate != null;
-    }
+    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, Object value) {
+    public ManualChange withChange(String property, String value) {
        this.propertyChanges.put(property, value);
        return this;
    }
@@ -2,6 +2,6 @@ package com.iqser.red.service.redaction.v1.model;

 public enum MessageType {

-    FULL_ANALYSE, REANALYSE, SURROUNDING_TEXT
+    ANALYSE, REANALYSE, STRUCTURE_ANALYSE, SURROUNDING_TEXT

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

-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+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 {


@@ -23,8 +27,8 @@ public class RedactionLog {
     */
    private int analysisNumber;

-    private List<RedactionLogEntry> redactionLogEntry;
-    private List<LegalBasis> legalBasis;
+    private List<RedactionLogEntry> redactionLogEntry = new ArrayList<>();
+    private List<RedactionLogLegalBasis> legalBasis = new ArrayList<>();

    private long dictionaryVersion = -1;
    private long dossierDictionaryVersion = -1;
@@ -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,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.model;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import lombok.*;

 import java.util.*;
@@ -22,9 +21,12 @@ public class RedactionLogEntry {
    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;
@@ -38,7 +40,7 @@ public class RedactionLogEntry {
    private String textAfter;

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

    private int startOffset;
    private int endOffset;
@@ -51,6 +53,8 @@ public class RedactionLogEntry {

    private boolean excluded;

+    private String sourceId;
+
    @EqualsAndHashCode.Exclude
    @Builder.Default
    private List<Change> changes = new ArrayList<>();
@@ -63,6 +67,9 @@ public class RedactionLogEntry {

    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);
    }
@@ -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,15 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.HashSet;
-import java.util.Set;
-
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import 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
@@ -22,4 +24,9 @@ public class RedactionRequest {
    private ManualRedactions manualRedactions;
    @Builder.Default
    private Set<Integer> excludedPages = new HashSet<>();
+
+    private Colors colors;
+    private List<Type> types;
+
+    private boolean includeFalsePositives;
 }
@@ -3,27 +3,16 @@ 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) {
@@ -1,13 +1,14 @@
 package com.iqser.red.service.redaction.v1.model;

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

 import java.util.*;

@Data
+@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
 public class SectionGrid {
@@ -17,13 +18,14 @@ public class SectionGrid {
    private List<SectionGridSection> sections = new ArrayList<>();

    @Data
-    @RequiredArgsConstructor
+    @NoArgsConstructor
+    @AllArgsConstructor
    public static class SectionGridSection {

-        private final int sectionNumber;
-        private final String headline;
-        private final Set<Integer> pages;
-        private final List<SectionArea> sectionAreas;
+        private int sectionNumber;
+        private String headline;
+        private Set<Integer> pages;
+        private List<SectionArea> sectionAreas;

    }
 }
@@ -3,30 +3,18 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;

 import java.util.List;

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

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

    private List<CellRectangle> tableCells;
@@ -1,20 +1,16 @@
 package com.iqser.red.service.redaction.v1.resources;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.*;
-
+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 org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;

 public interface RedactionResource {

-    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
-
-
    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);

@@ -12,18 +12,50 @@
    <artifactId>redaction-service-server-v1</artifactId>

    <properties>
-        <drools.version>7.59.0.Final</drools.version>
-        <kie.version>7.59.0.Final</kie.version>
-        <locationtech.version>1.16.1</locationtech.version>
-        <pdfbox.jbig2-imageio.version>3.0.3</pdfbox.jbig2-imageio.version>
-        <jai-imageio.version>1.4.0</jai-imageio.version>
+        <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>
@@ -49,22 +81,6 @@
            <artifactId>guava</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>jbig2-imageio</artifactId>
-            <version>${pdfbox.jbig2-imageio.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-core</artifactId>
-            <version>${jai-imageio.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.jai-imageio</groupId>
-            <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>${jai-imageio.version}</version>
-        </dependency>
-
        <!-- commons -->
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -113,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>
@@ -9,8 +9,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;
+
@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
@@ -22,5 +26,10 @@ public class Application {
        SpringApplication.run(Application.class, args);
    }

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

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

+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import lombok.AllArgsConstructor;
@@ -14,6 +15,7 @@ public class Footer {
    private List<TextBlock> textBlocks;

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

        SearchableText searchableText = new SearchableText();
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import lombok.AllArgsConstructor;
@@ -14,6 +15,7 @@ public class Header {
    private List<TextBlock> textBlocks;

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

        SearchableText searchableText = new SearchableText();
@@ -1,5 +1,7 @@
 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;
@@ -14,6 +16,7 @@ import java.util.*;

@Data
@Builder
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class SectionText {
@@ -38,6 +41,7 @@ public class SectionText {
    }

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

        SearchableText searchableText = new 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,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,6 +9,7 @@ import java.util.ArrayList;
 import java.util.List;

@Data
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class Text {
@@ -1,5 +1,7 @@
 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;
@@ -15,6 +17,7 @@ import java.util.List;
@AllArgsConstructor
@Builder
@Data
+@CompiledJson
@NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {

@@ -121,6 +124,7 @@ public class TextBlock extends AbstractTextContainer {

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

        StringBuilder sb = new StringBuilder();
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import lombok.AllArgsConstructor;
@@ -14,6 +15,7 @@ public class UnclassifiedText {
    private List<TextBlock> textBlocks;

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

        SearchableText searchableText = new SearchableText();
@@ -52,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()
@@ -1,16 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.client;

+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;

-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class MockMultipartFile implements MultipartFile {

    private final String name;
@@ -82,13 +82,13 @@ public class MockMultipartFile implements MultipartFile {
    }


-    public byte[] getBytes() throws IOException {
+    public byte[] getBytes() {

        return this.content;
    }


-    public InputStream getInputStream() throws IOException {
+    public InputStream getInputStream() {

        return new ByteArrayInputStream(this.content);
    }
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.client.model;

+import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;

@Data
@Builder
+@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
 public class EntityRecogintionEntity {
@@ -4,18 +4,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@Data
-@Builder
-@AllArgsConstructor
+@CompiledJson
@NoArgsConstructor
+@AllArgsConstructor
 public class NerEntities {

-   @Builder.Default
-   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
+    private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();

 }
@@ -16,7 +16,6 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,53 +32,19 @@ public class RedactionController implements RedactionResource {

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

-
-    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
-
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest
-                .getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder()
-                .fileId(annotateRequest.getFileId())
-                .manualRedactions(annotateRequest.getManualRedactions())
-                .dossierId(annotateRequest.getDossierId())
-                .dossierTemplateId(annotateRequest.getDossierTemplateId())
-                .build());
-        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
-
-        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
-            annotationService.annotate(pdDocument, mergedRedactionLog, sectionsGrid);
-
-            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-                pdDocument.save(byteArrayOutputStream);
-                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
-            }
-
-        } catch (Exception e) {
-            throw new RedactionException(e);
-        }
-    }
-
-
    @Override
    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);

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

@@ -101,13 +66,11 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);

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

@@ -131,8 +94,7 @@ public class RedactionController implements RedactionResource {
        Document classifiedDoc;

        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
-                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            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);
@@ -163,39 +125,8 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {

-        log.info("Requested preview for: {}", redactionRequest);
-        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());

-        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-        if (redactionLog == null) {
-            throw new NotFoundException("RedactionLog not present");
-        }
-
-        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-
-        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest
-                .getFileId());
-        if (sectionGrid.getSections().isEmpty()) {
-
-            log.info("SectionGrid does not have headlines set. Computing headlines now!");
-            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-            // enhance section grid with headline data
-            for (var sectionText : text.getSectionTexts()) {
-                sectionGrid.getSections()
-                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText
-                                .getSectionAreas()
-                                .stream()
-                                .map(SectionArea::getPage)
-                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
-            }
-            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
-        }
-
-        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-        return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest
-                .getManualRedactions(), redactionRequest.getExcludedPages());
+        return redactionLogMergeService.provideRedactionLog(redactionRequest);
    }


@@ -217,11 +148,9 @@ public class RedactionController implements RedactionResource {
                                               @PathVariable("fileId") String fileId,
                                               @RequestBody ManualRedactions manualRedactions) {

-        long start = System.currentTimeMillis();
        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
-        log.info("add surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, System
-                .currentTimeMillis() - start);
-        return result;
+        log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());
+        return result.getManualRedactions();
    }

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

-        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())));
+        // 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())));
+        }
    }

    /**
@@ -1,52 +1,26 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-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.commons.lang3.reflect.FieldUtils;
-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.TextPosition;
-import org.apache.pdfbox.util.Matrix;
-
 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.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.OperatorName;
+import org.apache.pdfbox.contentstream.operator.color.*;
+import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSNumber;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.text.TextPosition;
+
+import java.awt.geom.Point2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
@@ -66,8 +40,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    private int minCharHeight;
    @Getter
    private int maxCharHeight;
-    @Getter
-    private List<PdfImage> images = new ArrayList<>();

    private float path_x;
    private float path_y;
@@ -183,9 +155,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                graphicsPath.clear();
                break;

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

        }

@@ -193,32 +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 image = (PDImageXObject) xobject;
-                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
-
-                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
-
-                // Memory Hack - sofReference kills me
-                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
-
-                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage()
-                            .getColorModel()
-                            .hasAlpha()));
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Problem during image extraction: {}", e.getMessage());
-        }
-    }
-
-
    private float floatValue(COSBase value) {

        if (value instanceof COSNumber) {
@@ -244,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()
@@ -375,7 +318,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        minCharHeight = Integer.MAX_VALUE;
        maxCharHeight = 0;
        textPositionSequences.clear();
-        images = new ArrayList<>();
        rulings.clear();
        graphicsPath.clear();
        path_x = 0.0f;
@@ -1,14 +1,24 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 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;
@@ -17,7 +27,13 @@ public class RedTextPosition {
    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;
@@ -26,14 +42,17 @@ public class RedTextPosition {

    // 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;


@@ -51,4 +70,14 @@ public class RedTextPosition {
    }


+    @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;}
+
+
 }
@@ -6,18 +6,25 @@ 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.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -112,6 +119,7 @@ public class TextPositionSequence implements CharSequence {


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

        if (textPositions.get(0).getRotation() == 90) {
@@ -123,18 +131,19 @@ 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();
@@ -142,6 +151,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getXDirAdj();
@@ -149,6 +159,7 @@ public class TextPositionSequence implements CharSequence {


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

        if (textPositions.get(0).getRotation() == 90) {
@@ -160,6 +171,7 @@ public class TextPositionSequence implements CharSequence {


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

        if (textPositions.get(0).getRotation() == 90) {
@@ -171,6 +183,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getHeightDir() + 2;
@@ -178,6 +191,7 @@ public class TextPositionSequence implements CharSequence {


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

        return getY2() - getY1();
@@ -185,6 +199,7 @@ public class TextPositionSequence implements CharSequence {


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

        return getX2() - getX1();
@@ -192,6 +207,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
@@ -199,6 +215,7 @@ public class TextPositionSequence implements CharSequence {


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

        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
@@ -217,6 +234,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getFontSizeInPt();
@@ -224,6 +242,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getWidthOfSpace();
@@ -231,6 +250,7 @@ public class TextPositionSequence implements CharSequence {


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

        return textPositions.get(0).getRotation();
@@ -238,9 +258,10 @@ public class TextPositionSequence implements CharSequence {


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

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

        float height = getTextHeight();

@@ -249,54 +270,113 @@ public class TextPositionSequence implements CharSequence {
        float posYInit;
        float posYEnd;

-        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
+        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 && textPositions.get(0).getDir() == 270.0f) {
+        } 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;
+
+        } 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)
-                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
+            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;
+            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() == 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() == 270 && textPositions.get(0).getDir() == 90.0f) {

-        } 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() == 0 && textPositions.get(0).getDir() == 90f) {
            posYInit = getX1();
-            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
-                    .getWidthDirAdj() - 3;
+            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 {
-            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+            // 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;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1).getYDirAdj() + 2;
        }

        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
@@ -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);
+    }
+
+}
@@ -1,8 +1,10 @@
 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;

@@ -10,11 +12,24 @@ import org.springframework.context.annotation.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() {
@@ -27,9 +42,21 @@ public class MessagingConfiguration {
    }


+    @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);
+    }
+
+}
@@ -1,5 +1,11 @@
 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;
@@ -8,18 +14,10 @@ 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 com.iqser.red.service.redaction.v1.server.redaction.service.NerAnalyserService;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
-
@Slf4j
@Service
@RequiredArgsConstructor
@@ -28,48 +26,49 @@ public class RedactionMessageReceiver {
    private final ObjectMapper objectMapper;
    private final AnalyzeService analyzeService;
    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
-    private final NerAnalyserService nerAnalyserService;
    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;


-    @RabbitHandler
-    @RabbitListener(queues = REDACTION_QUEUE)
-    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
+    public void receiveAnalyzeRequest(String in, boolean priority) throws JsonProcessingException {

        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
+        log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
        AnalyzeResult result = null;

-        switch (analyzeRequest.getMessageType()){
+        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 FULL_ANALYSE:
-                // TODO Seperate stucture analysis by other queue
-                analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+                case REANALYSE:
+                    result = analyzeService.reanalyze(analyzeRequest);
+                    log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;

-                // TODO NerEntities should be computed and stored in entity-recognition-service, should be triggered by a seperate queue after structure analysis
-                nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+                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;

-                result = analyzeService.analyze(analyzeRequest);
-                log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result
-                        .getDuration());
+                case ANALYSE:
+                    result = analyzeService.analyze(analyzeRequest);
+                    log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;

-                break;
-            case SURROUNDING_TEXT:
-                var manualRedactions = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
-                result = AnalyzeResult.builder()
-                        .dossierId(analyzeRequest.getDossierId())
-                        .fileId(analyzeRequest.getFileId())
-                        .manualRedactions(manualRedactions)
-                        .build();
-                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());
        }
-
-        result.setMessageType(analyzeRequest.getMessageType());
-        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
    }


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

-import static java.util.stream.Collectors.toSet;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import lombok.Data;
-import lombok.Getter;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

+import lombok.Data;
+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<>();
@@ -26,6 +20,7 @@ public class Dictionary {


    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
+
        this.dictionaryModels = dictionaryModels;
        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
        this.version = version;
@@ -33,6 +28,7 @@ public class Dictionary {


    public int getDictionaryRank(String type) {
+
        if (!localAccessMap.containsKey(type)) {
            return 0;
        }
@@ -40,16 +36,6 @@ public class Dictionary {
    }


-    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());
@@ -62,17 +48,9 @@ public class Dictionary {
    }


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

-        return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getValues(false)
-                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getValues(true)
-                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getValues(false)
-                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getValues(true)
-                .contains(value);
+        return localAccessMap.get(type);
    }


@@ -85,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<>();
+
+}
@@ -2,10 +2,12 @@ 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;

@@ -14,19 +16,76 @@ import java.util.stream.Collectors;
@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 boolean isDossierDictionary;
+    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;
+    }
+
+
 }
@@ -1,17 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 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 implements ReasonHolder {

@@ -48,11 +54,15 @@ public class Entity implements ReasonHolder {

    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) {
+                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references, EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -71,11 +81,12 @@ public class Entity implements ReasonHolder {
        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, boolean isDossierDictionaryEntry, Engine engine) {
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine, EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -86,6 +97,7 @@ public class Entity implements ReasonHolder {
        this.isDictionaryEntry = isDictionaryEntry;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
        this.engines.add(engine);
+        this.entityType = entityType;
    }


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

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import java.util.ArrayList;
 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
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public enum EntityType {
+    ENTITY, RECOMMENDATION, FALSE_POSITIVE, FALSE_RECOMMENDATION
+}
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.NoArgsConstructor;

@Data
@Builder
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class Image implements ReasonHolder {
@@ -1,34 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-
@Data
@RequiredArgsConstructor
 public class PdfImage {

-    @JsonIgnore
-    private BufferedImage image;
    @NonNull
    private RedRectangle2D position;
    @NonNull
    private ImageType imageType;
    private boolean isAppendedToParagraph;
+    @NonNull
    private boolean hasTransparency;
-
    @NonNull
    private int page;

-    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
-        this.image = image;
-        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
-        this.page = page;
-        this.hasTransparency = hasTransparency;
-    }
-
 }
@@ -1,12 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-
+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
+@Builder
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class RedRectangle2D {
@@ -19,6 +24,7 @@ public class RedRectangle2D {
    private double height;

    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public boolean isEmpty() {
        return width <= 0.0f || height <= 0.0f;
    }
@@ -1,16 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+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.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SeparatorUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.regex.Pattern;

 public class SearchableText {

+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private transient String stringRepresentation;
    private final List<TextPositionSequence> sequences = new ArrayList<>();


@@ -88,8 +94,8 @@ public class SearchableText {
                        .get(i)
                        .charAt(j, caseInsensitive) == '-') {

-                    if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(searchSpace.get(i)
-                            .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && isSeparator(searchSpace.get(i - 1)
+                    if (counter != 0 || i == 0 && j == 0 || j != 0 && SeparatorUtils.isSeparator(searchSpace.get(i)
+                            .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && SeparatorUtils.isSeparator(searchSpace.get(i - 1)
                            .charAt(searchSpace.get(i - 1)
                                    .length() - 1, caseInsensitive)) || j == 0 && i != 0 && searchSpace.get(i - 1)
                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchSpace.get(i)
@@ -105,9 +111,9 @@ public class SearchableText {
                        crossSequenceParts.add(partMatch);

                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
-                                .length() - 1 || j != searchSpace.get(i).length() - 1 && isSeparator(searchSpace.get(i)
+                                .length() - 1 || j != searchSpace.get(i).length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i)
                                .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
-                                .length() - 1 && isSeparator(searchSpace.get(i + 1)
+                                .length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i + 1)
                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
                                .length() - 1 && searchSpace.get(i)
                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
@@ -175,18 +181,18 @@ public class SearchableText {
    }


-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
    @Override
    public String toString() {
-
        return buildString(sequences);
    }

+    public String asString() {
+        if (stringRepresentation == null) {
+            stringRepresentation = buildString(sequences);
+        }
+        return stringRepresentation;
+    }
+

    public String buildString(List<TextPositionSequence> sequences) {

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

+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -9,5 +11,6 @@ public class SectionSearchableTextPair {

    private Section section;
    private SearchableText searchableText;
+    private List<Integer> cellStarts;

 }
@@ -3,9 +3,11 @@ package com.iqser.red.service.redaction.v1.server.redaction.model.image;
 import java.util.HashMap;
 import java.util.Map;

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

@Data
+@CompiledJson
 public class Classification {

    private Map<String, Float> probabilities = new HashMap<>();
@@ -1,8 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class FilterGeometry {

    private ImageSize imageSize;
@@ -1,8 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class Filters {

    private FilterGeometry geometry;
@@ -1,9 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class Geometry {
    private float width;
    private float height;
-}
+}
@@ -1,8 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class ImageFormat {

    private float quotient;
@@ -1,12 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class ImageMetadata {

    private Classification classification;
    private Position position;
    private Geometry geometry;
    private Filters filters;
+    private boolean alpha;
 }
@@ -1,15 +1,29 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
 import java.util.ArrayList;
 import java.util.List;

-import lombok.Data;
-
@Data
+@CompiledJson
 public class ImageServiceResponse {

    private String dossierId;
    private String fileId;
-    private List<ImageMetadata> imageMetadata = new ArrayList<>();
+
+    @JsonProperty(value = "imageMetadata")
+    @JsonAlias("data")
+    @JsonAttribute(alternativeNames = {"imageMetadata"})
+    private List<ImageMetadata> data = new ArrayList<>();
+
+    @JsonProperty(value = "imageMetadata")
+    @JsonAlias("data")
+    @JsonAttribute(alternativeNames = {"imageMetadata"})
+    public void setData(List<ImageMetadata> data) {this.data = data;}

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

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

@Data
+@CompiledJson
 public class ImageSize {

    private float quotient;
@@ -1,12 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class Position {
    private float x1;
    private float x2;
    private float y1;
    private float y2;
    private int pageNumber;
-}
+}
@@ -1,8 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

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

@Data
+@CompiledJson
 public class Probability {

    private boolean unconfident;
@@ -1,34 +1,65 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
 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.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+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.Rectangle;
+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.RedactionLogLegalBasis;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.SimplifiedSectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.SimplifiedText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

@Slf4j
@Service
@@ -46,12 +77,12 @@ public class AnalyzeService {
    private final RedactionServiceSettings redactionServiceSettings;
    private final SectionTextBuilderService sectionTextBuilderService;
    private final SectionGridCreatorService sectionGridCreatorService;
-    private final NerAnalyserService nerAnalyserService;
    private final ImageService imageService;
    private final ImportedRedactionService importedRedactionService;


-    public void analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
+    @Timed("redactmanager_analyzeDocumentStructure")
+    public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {

        long startTime = System.currentTimeMillis();

@@ -59,9 +90,7 @@ public class AnalyzeService {
        Document classifiedDoc;

        try {
-
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
-                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));

            Map<Integer, List<PdfImage>> pdfImages = null;
            if (redactionServiceSettings.isEnableImageClassification()) {
@@ -74,59 +103,35 @@ public class AnalyzeService {
        }

        List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
+
        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);

        Text text = new Text(pageCount, sectionTexts);

        // enhance section grid with headline data
-        sectionTexts.forEach(sectionText -> classifiedDoc
-                .getSectionGrid().getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
-                        sectionText.getHeadline(),
-                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
-                        sectionText.getSectionAreas())));
+        sectionTexts.forEach(sectionText -> classifiedDoc.getSectionGrid()
+                .getSections()
+                .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
+                        .stream()
+                        .map(SectionArea::getPage)
+                        .collect(Collectors.toSet()), sectionText.getSectionAreas())));

+        log.info("Store text, simplified text and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
-                .getSectionGrid());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SIMPLIFIED_TEXT, convert(text));
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc.getSectionGrid());

-        log.info("Document structure analysis successful, took: {}", System.currentTimeMillis() - startTime);
-    }
-
-
-    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null) {
-            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        }
-
-        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
-
-        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
-
-        dictionaryService.updateExternalDictionary(dictionary, analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
-                .getDossierTemplateId());
-
-        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(),
-                redactionLogEntries, legalBasis, dictionary.getVersion().getDossierTemplateVersion(), dictionary.getVersion().getDossierVersion(),
-                rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
-
-        importedRedactionService.processImportedRedactions(redactionLog, analyzeRequest.getImportedAnnotations(), analyzeRequest.getDossierTemplateId());
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
+        return AnalyzeResult.builder()
+                .dossierId(analyzeRequest.getDossierId())
+                .fileId(analyzeRequest.getFileId())
+                .duration(System.currentTimeMillis() - startTime)
+                .numberOfPages(text.getNumberOfPages())
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
+                .build();
    }


+    @Timed("redactmanager_reanalyze")
    @SneakyThrows
    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {

@@ -140,8 +145,7 @@ public class AnalyzeService {
            return analyze(analyzeRequest);
        }

-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
-                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());

        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse()
                .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
@@ -150,10 +154,11 @@ public class AnalyzeService {
            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
        }

-        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null) {
-            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        } else {
+            nerEntities = new NerEntities();
        }

        List<SectionText> reanalysisSections = text.getSectionTexts()
@@ -163,20 +168,57 @@ public class AnalyzeService {

        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());

-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());

        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
-        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
-                .getDossierTemplateId());

-        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        importedRedactionService.processImportedRedactions(redactionLog, analyzeRequest.getImportedAnnotations(), analyzeRequest.getDossierTemplateId());
+        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false);
+
+        redactionLog.getRedactionLogEntry()
+                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()) && !entry.getType()
+                        .equals(IMPORTED_REDACTION_TYPE));
+        redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+
        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
    }


+    @Timed("redactmanager_analyze")
+    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
+            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        } else {
+            nerEntities = new NerEntities();
+        }
+        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+
+        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
+
+        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
+
+        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(), redactionLogEntries, convert(legalBasis), dictionary.getVersion()
+                .getDossierTemplateVersion(), dictionary.getVersion()
+                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog.getRedactionLogEntry(), true);
+        redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
+
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
+    }
+
+
+    @Timed("redactmanager_findSectionsToReanalyse")
    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
                                                 Text text, AnalyzeRequest analyzeRequest) {

@@ -194,9 +236,13 @@ public class AnalyzeService {
            }
        }

+
+        var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues().stream()
+                .map(DictionaryIncrementValue::getValue).collect(Collectors.toList()), true);
+
        for (SectionText sectionText : text.getSectionTexts()) {

-            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrementsSearch)) {
                sectionsToReanalyse.add(sectionText.getSectionNumber());
            }

@@ -217,10 +263,8 @@ public class AnalyzeService {

        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());

-        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(),
-                redactionLog, analyzeRequest.getAnalysisNumber());
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange
-                .getRedactionLog());
+        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog, analyzeRequest.getAnalysisNumber());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());

        long duration = System.currentTimeMillis() - startTime;

@@ -248,16 +292,22 @@ public class AnalyzeService {
            return new HashSet<>();
        }

-        return Stream.concat(manualRedactions.getLegalBasisChanges()
-                        .stream()
-                        .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
-                        .stream()
-                        .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
-                        .stream()
-                        .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))
-                .collect(Collectors.toSet());
+        return Stream.concat(manualRedactions.getResizeRedactions()
+                .stream()
+                .map(ManualResizeRedaction::getAnnotationId), Stream.concat(manualRedactions.getLegalBasisChanges()
+                .stream()
+                .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
+                .stream()
+                .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions()
+                .stream()
+                .map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
    }

+    public List<RedactionLogLegalBasis> convert(List<LegalBasis> legalBasis) {
+        return legalBasis.stream().map(l -> new RedactionLogLegalBasis(l.getName(), l.getDescription(), l.getReason())).collect(Collectors.toList());
+    }

    public Image convert(RedactionLogEntry entry) {

@@ -286,4 +336,17 @@ public class AnalyzeService {
        }
    }

+
+    private SimplifiedText convert(Text text) {
+
+        List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
+        int numberOfPages = 0;
+
+        if (text != null) {
+            numberOfPages = text.getNumberOfPages();
+            text.getSectionTexts().stream().filter(Objects::nonNull).forEach(st -> sectionTexts.add(new SimplifiedSectionText(st.getSectionNumber(), st.getText())));
+        }
+        return SimplifiedText.builder().numberOfPages(numberOfPages).sectionTexts(sectionTexts).build();
+    }
+
 }
@@ -5,8 +5,8 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ty
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import feign.FeignException;
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -18,38 +18,44 @@ import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;

-
@Slf4j
@Service
@RequiredArgsConstructor
 public class DictionaryService {

+    private static final String DEFAULT_COLOR = "#cccccc";
    private final DictionaryClient dictionaryClient;

    private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();


+    @Timed("redactmanager_updateDictionary")
    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

        log.info("Updating dictionary data for dossierTemplate {} and dossier {}", dossierTemplateId, dossierId);
        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId);
        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, null);
+            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, getVersion(dossierTemplateDictionary), null);
        }

        long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
        var dossierDictionary = dictionariesByDossier.get(dossierId);
        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
+            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, getVersion(dossierDictionary), dossierId);
        }

-        return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
+        return DictionaryVersion.builder()
+                .dossierTemplateVersion(dossierTemplateDictionaryVersion)
+                .dossierVersion(dossierDictionaryVersion)
+                .build();
    }


-    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {
+    @Timed("redactmanager_getDictionaryIncrements")
+    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion,
+                                                       String dossierId) {

        DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);

@@ -61,6 +67,16 @@ public class DictionaryService {
                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                }
            });
+            dictionaryModel.getFalsePositives().forEach(dictionaryEntry -> {
+                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
+                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                }
+            });
+            dictionaryModel.getFalseRecommendations().forEach(dictionaryEntry -> {
+                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
+                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                }
+            });
        });

        if (dictionariesByDossier.containsKey(dossierId)) {
@@ -71,6 +87,16 @@ public class DictionaryService {
                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                    }
                });
+                dictionaryModel.getFalsePositives().forEach(dictionaryEntry -> {
+                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
+                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                    }
+                });
+                dictionaryModel.getFalseRecommendations().forEach(dictionaryEntry -> {
+                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
+                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                    }
+                });
            });
        }

@@ -78,29 +104,83 @@ public class DictionaryService {
    }


-    private void updateDictionaryEntry(String dossierTemplateId, long version, String dossierId) {
+    private void updateDictionaryEntry(String dossierTemplateId, long version, Long currentVersion, String dossierId) {

        try {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

-            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
+            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId, false) : dictionaryClient.getAllTypesForDossier(dossierId, false);
            if (CollectionUtils.isNotEmpty(typeResponse)) {

-                List<DictionaryModel> dictionary = typeResponse
-                        .stream()
-                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t.getId()), new HashSet<>(), dossierId != null))
-                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
-                        .collect(Collectors.toList());
+                List<DictionaryModel> dictionary = typeResponse.stream().map(t -> {
+
+                    Optional<DictionaryModel> oldModel;
+                    if (dossierId == null) {
+                        var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
+                        oldModel = representation != null ? representation.getDictionary()
+                                .stream()
+                                .filter(f -> f.getType().equals(t.getType()))
+                                .findAny() : Optional.empty();
+                    } else {
+                        var representation = dictionariesByDossier.get(dossierId);
+                        oldModel = representation != null ? representation.getDictionary()
+                                .stream()
+                                .filter(f -> f.getType().equals(t.getType()))
+                                .findAny() : Optional.empty();
+                    }
+
+                    Set<DictionaryEntry> entries = new HashSet<>();
+                    Set<DictionaryEntry> falsePositives = new HashSet<>();
+                    Set<DictionaryEntry> falseRecommendations = new HashSet<>();
+
+                    DictionaryEntries newEntries = getEntries(t.getId(), currentVersion);
+
+                    var newValues = newEntries.getEntries()
+                            .stream()
+                            .map(DictionaryEntry::getValue)
+                            .collect(Collectors.toSet());
+                    var newFalsePositivesValues = newEntries.getFalsePositives()
+                            .stream()
+                            .map(DictionaryEntry::getValue)
+                            .collect(Collectors.toSet());
+                    var newFalseRecommendationsValues = newEntries.getFalseRecommendations()
+                            .stream()
+                            .map(DictionaryEntry::getValue)
+                            .collect(Collectors.toSet());
+
+                    oldModel.ifPresent(oldDictionaryModel -> {
+
+                    });
+                    // add old entries from existing DictionaryModel
+                    oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries()
+                            .stream()
+                            .filter(f -> !newValues.contains(f.getValue()))
+                            .collect(Collectors.toList())));
+                    oldModel.ifPresent(dictionaryModel -> falsePositives.addAll(dictionaryModel.getFalsePositives()
+                            .stream()
+                            .filter(f -> !newFalsePositivesValues.contains(f.getValue()))
+                            .collect(Collectors.toList())));
+                    oldModel.ifPresent(dictionaryModel -> falseRecommendations.addAll(dictionaryModel.getFalseRecommendations()
+                            .stream()
+                            .filter(f -> !newFalseRecommendationsValues.contains(f.getValue()))
+                            .collect(Collectors.toList())));
+
+                    // Add Increments
+                    entries.addAll(newEntries.getEntries());
+                    falsePositives.addAll(newEntries.getFalsePositives());
+                    falseRecommendations.addAll(newEntries.getFalseRecommendations());
+
+                    return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t.isHint(), entries, falsePositives, falseRecommendations, dossierId != null);
+                }).sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList());

                dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));

                Colors colors = dictionaryClient.getColors(dossierTemplateId);

-                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
-                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
-                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
-                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
+                dictionaryRepresentation.setDefaultColor(convertColor(DEFAULT_COLOR));
+                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAddColor()));
+                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemoveColor()));
+                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getSkippedColor()));
                dictionaryRepresentation.setDossierTemplateId(dossierTemplateId);
                dictionaryRepresentation.setDictionaryVersion(version);
                dictionaryRepresentation.setDictionary(dictionary);
@@ -118,31 +198,21 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId, String dossierId) {
+    private DictionaryEntries getEntries(String typeId, Long fromVersion) {

-        dictionary.getDictionaryModels().forEach(dm -> {
-            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false, true);
-                long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
-                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
-                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
-                }
-            }
-        });
-    }
+        var type = dictionaryClient.getDictionaryForType(typeId, fromVersion);

-
-    private Set<DictionaryEntry> convertEntries(String typeId) {
-
-        var type = dictionaryClient.getDictionaryForType(typeId);
-
-        Set<DictionaryEntry> entries = new HashSet<>(type
-                .getEntries());
+        Set<DictionaryEntry> entries = type.getEntries() != null ? new HashSet<>(type.getEntries()) : new HashSet<>();
+        Set<DictionaryEntry> falsePositives = type.getFalsePositiveEntries() != null ? new HashSet<>(type.getFalsePositiveEntries()) : new HashSet<>();
+        Set<DictionaryEntry> falseRecommendations = type.getFalseRecommendationEntries() != null ? new HashSet<>(type.getFalseRecommendationEntries()) : new HashSet<>();

        if (type.isCaseInsensitive()) {
            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
+            falsePositives.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
+            falseRecommendations.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
-        return entries;
+        log.info("Dictionary update returned {} entries {} falsePositives and {} falseRecommendations for type {}", entries.size(), falsePositives.size(), falseRecommendations.size(), type.getType());
+        return new DictionaryEntries(entries, falsePositives, falseRecommendations);
    }


@@ -153,16 +223,6 @@ public class DictionaryService {
    }


-    public boolean isCaseInsensitiveDictionary(String type, String dossierTemplateId) {
-
-        DictionaryModel dictionaryModel = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
-        if (dictionaryModel != null) {
-            return dictionaryModel.isCaseInsensitive();
-        }
-        return false;
-    }
-
-
    public float[] getColor(String type, String dossierTemplateId) {

        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
@@ -183,16 +243,7 @@ public class DictionaryService {
    }


-    public boolean isRecommendation(String type, String dossierTemplateId) {
-
-        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
-        if (model != null) {
-            return model.isRecommendation();
-        }
-        return false;
-    }
-
-
+    @Timed("redactmanager_getDeepCopyDictionary")
    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {

        List<DictionaryModel> copy = new ArrayList<>();
@@ -212,13 +263,12 @@ public class DictionaryService {
            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
        }

-        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
-    }
-
-
-    public float[] getRequestRemoveColor(String dossierTemplateId) {
-
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
+        return new Dictionary(copy.stream()
+                .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
+                .collect(Collectors.toList()), DictionaryVersion.builder()
+                .dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion())
+                .dossierVersion(dossierDictionaryVersion)
+                .build());
    }


@@ -228,9 +278,13 @@ public class DictionaryService {
    }


-    public float[] getRequestAddColor(String dossierTemplateId) {
+    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+        if (dictionaryRepresentation == null) {
+            return null;
+        } else {
+            return dictionaryRepresentation.getDictionaryVersion();
+        }
    }

 }
@@ -3,6 +3,8 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
@@ -41,6 +43,7 @@ public class DroolsExecutionService {
    }


+    @Timed("redactmanager_executeRules")
    public Section executeRules(KieContainer kieContainer, Section section) {

        KieSession kieSession = kieContainer.newKieSession();
@@ -1,6 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
@@ -8,20 +22,24 @@ import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

@Slf4j
@Service
@@ -33,6 +51,7 @@ public class EntityRedactionService {
    private final SurroundingWordsService surroundingWordsService;


+
    public PageEntities findEntities(Dictionary dictionary, List<SectionText> sectionTexts, KieContainer kieContainer,
                                     AnalyzeRequest analyzeRequest, NerEntities nerEntities) {

@@ -46,7 +65,9 @@ public class EntityRedactionService {
            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
        }

-        Map<Integer, List<Entity>> entitiesPerPage = convertToEnititesPerPage(entities);
+        Map<Integer, List<Entity>> entitiesPerPage = convertToEntitiesPerPage(entities);
+        EntitySearchUtils.removeEntitiesContainedInRedactedLogos(imagesPerPage, entitiesPerPage);
+
        return new PageEntities(entitiesPerPage, imagesPerPage);
    }

@@ -59,8 +80,7 @@ public class EntityRedactionService {
        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (SectionText reanalysisSection : reanalysisSections) {

-            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
-                    .getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts());
+            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts(), analyzeRequest.getManualRedactions());

            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary, reanalysisSection
@@ -71,16 +91,24 @@ public class EntityRedactionService {

            if (!local && analyzeRequest.getManualRedactions() != null) {

-                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
+                var approvedForceRedactions = analyzeRequest.getManualRedactions()
+                        .getForceRedactions()
+                        .stream()
                        .filter(fr -> fr.getStatus() == AnnotationStatus.APPROVED)
                        .filter(fr -> fr.getRequestDate() != null)
                        .collect(Collectors.toList());
                // only approved id removals, that haven't been forced back afterwards
-                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
+                var idsToRemove = analyzeRequest.getManualRedactions()
+                        .getIdsToRemove()
+                        .stream()
                        .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
                        .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
-                        .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());
+                        .filter(idr -> approvedForceRedactions.stream()
+                                .noneMatch(forceRedact -> forceRedact.getAnnotationId()
+                                        .equals(idr.getAnnotationId()) && forceRedact.getRequestDate()
+                                        .isAfter(idr.getRequestDate())))
+                        .map(IdRemoval::getAnnotationId)
+                        .collect(Collectors.toSet());

                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                        .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
@@ -107,12 +135,13 @@ public class EntityRedactionService {
                }));
            }

+            log.debug("Section {}, Images: {}", reanalysisSection.getSectionNumber(), reanalysisSection.getImages());
+
            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(false)
                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
-                            .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
-                                    .stream())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream.concat(entities.getEntities()
+                                    .stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber()).stream())
                            .collect(Collectors.toSet()) : entities.getEntities())
                    .nerEntities(entities.getNerEntities())
                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
@@ -123,14 +152,27 @@ public class EntityRedactionService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
+                    .sectionAreas(reanalysisSection.getSectionAreas())
                    .fileAttributes(analyzeRequest.getFileAttributes())
-                    .build(), reanalysisSection.getSearchableText()));
+                    .manualRedactions(analyzeRequest.getManualRedactions())
+                    .build(), reanalysisSection.getSearchableText(), reanalysisSection.getCellStarts()));
+
        }

        Set<Entity> entities = new HashSet<>();
        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
            EntitySearchUtils.removeEntitiesContainedInLarger(analysedSection.getEntities());
+
+            var entriesWithoutSurroundingText = analysedSection.getEntities().stream().filter(e -> e.getTextAfter() == null && e.getTextBefore() == null).collect(Collectors.toSet());
+
+            if (sectionSearchableTextPair.getCellStarts() != null && !sectionSearchableTextPair.getCellStarts()
+                    .isEmpty()) {
+                surroundingWordsService.addSurroundingText(entriesWithoutSurroundingText, sectionSearchableTextPair.getSearchableText(), dictionary, sectionSearchableTextPair.getCellStarts());
+            } else {
+                surroundingWordsService.addSurroundingText(entriesWithoutSurroundingText, sectionSearchableTextPair.getSearchableText(), dictionary);
+            }
+
            entities.addAll(analysedSection.getEntities());

            if (!local) {
@@ -139,13 +181,14 @@ public class EntityRedactionService {
                }
                addLocalValuesToDictionary(analysedSection, dictionary);
            }
+
        });

        return entities;
    }


-    private Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities) {
+    private Map<Integer, List<Entity>> convertToEntitiesPerPage(Set<Entity> entities) {

        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
        for (Entity entity : entities) {
@@ -157,11 +200,7 @@ public class EntityRedactionService {

            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity
-                                .getReferences()));
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry.getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity.getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity.getReferences(), entity.getEntityType()));
            }
        }
        return entitiesPerPage;
@@ -182,80 +221,70 @@ public class EntityRedactionService {

    private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {

-        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-            if (dictionary.isRecommendation(key)) {
-                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                    if (!dictionary.containsValue(key, value)) {
-                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    }
-                });
-            } else {
-                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {

-                    if (dictionary.getLocalAccessMap().get(key) == null) {
-                        log.warn("Dictionary {} is null", key);
-                    }
-
-                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                        log.warn("Dictionary {} localEntries is null", key);
-                    }
-
-                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                });
+            if (dictionary.getLocalAccessMap().get(key) == null) {
+                log.warn("Dictionary {} is null", key);
            }
-        });
+
+            if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                log.warn("Dictionary {} localEntries is null", key);
+            }
+
+            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+        }));
    }


+    @Timed("redactmanager_findEntities")
    private Entities findEntities(SearchableText searchableText, String headline, int sectionNumber,
                                  Dictionary dictionary, boolean local, NerEntities nerEntities,
-                                  List<Integer> cellstarts) {
+                                  List<Integer> cellStarts, ManualRedactions manualRedactions) {

        Set<Entity> found = new HashSet<>();
-        String searchableString = searchableText.toString();
+        String searchableString = searchableText.asString();
+
        if (StringUtils.isEmpty(searchableString)) {
            return new Entities(new HashSet<>(), new HashSet<>());
        }

        String lowercaseInputString = searchableString.toLowerCase();
        for (DictionaryModel model : dictionary.getDictionaryModels()) {
-            if (model.isCaseInsensitive()) {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
-            } else {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
-            }
+
+            var searchImplementation = local ? model.getLocalSearch() : model.getEntriesSearch();
+            var entities = EntitySearchUtils.findEntities(model.isCaseInsensitive() ? lowercaseInputString : searchableString, searchImplementation, model, new FindEntityDetails(model.getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, local ? EntityType.RECOMMENDATION : EntityType.ENTITY));
+
+            EntitySearchUtils.addOrAddEngine(found, entities);
        }

        Set<Entity> nerFound = new HashSet<>();
        if (!local) {
-            nerFound.addAll(getNerValues(sectionNumber, nerEntities, cellstarts, headline));
+            nerFound.addAll(getNerValues(sectionNumber, nerEntities, cellStarts, headline));
        }

-        return new Entities(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary), nerFound);
+        return new Entities(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions), nerFound);
    }


-    private Set<Entity> getNerValues(int sectionNumber, NerEntities nerEntities,
-                                     List<Integer> cellstarts, String headline) {
+    private Set<Entity> getNerValues(int sectionNumber, NerEntities nerEntities, List<Integer> cellStarts,
+                                     String headline) {

        Set<Entity> entities = new HashSet<>();

-        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities.getResult()
-                .containsKey(sectionNumber)) {
-            nerEntities.getResult().get(sectionNumber).forEach(res -> {
-                if (cellstarts == null || cellstarts.isEmpty()) {
-                    entities.add(new Entity(new String(Base64.decodeBase64(res.getValue().getBytes())), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
+        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getData().containsKey(sectionNumber)) {
+            nerEntities.getData().get(sectionNumber).forEach(res -> {
+                if (cellStarts == null || cellStarts.isEmpty()) {
+                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
                } else {
                    boolean intersectsCellStart = false;
-                    for (Integer cellStart : cellstarts) {
+                    for (Integer cellStart : cellStarts) {
                        if (res.getStartOffset() < cellStart && cellStart < res.getEndOffset()) {
                            intersectsCellStart = true;
+                            break;
                        }
                    }
                    if (!intersectsCellStart) {
-                        entities.add(new Entity(new String(Base64.decodeBase64(res.getValue().getBytes())), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
+                        entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
                    }
                }
            });
@@ -1,98 +1,151 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.List;
-import java.util.stream.Collectors;

 import org.springframework.stereotype.Service;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImportedAnnotation;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ImportedAnnotationStatus;
+import com.iqser.red.service.redaction.v1.model.ImportedRedaction;
+import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;

+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;

@Service
@RequiredArgsConstructor
 public class ImportedRedactionService {

+    public static final String IMPORTED_REDACTION_TYPE = "imported_redaction";
+
    private final DictionaryService dictionaryService;
+    private final RedactionStorageService redactionStorageService;

-    public void processImportedRedactions(RedactionLog redactionLog, List<ImportedAnnotation> importedAnnotations, String dossierTemplateId) {

-        Iterator<RedactionLogEntry> itty = redactionLog.getRedactionLogEntry().iterator();
-        while (itty.hasNext()) {
-            RedactionLogEntry redactionLogEntry = itty.next();
-            boolean mustBeRemoved = false;
+    @Timed("redactmanager_processImportedRedactions")
+    public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId, String dossierId, String fileId,
+                                                             List<RedactionLogEntry> redactionLogEntries,
+                                                             boolean addImportedRedactions) {

-            if (redactionLogEntry.getType().equals("imported_redaction")) {
-                itty.remove();
-                continue;
+        var importedRedactions = redactionStorageService.getImportedRedactions(dossierId, fileId);
+        if (importedRedactions == null) {
+            return redactionLogEntries;
+        }
+
+        redactionLogEntries.forEach(redactionLogEntry -> addIntersections(redactionLogEntry, importedRedactions));
+
+        if (addImportedRedactions) {
+            return addImportedRedactionsRedactionLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private List<RedactionLogEntry> addImportedRedactionsRedactionLogEntries(String dossierTemplateId,
+                                                                             List<RedactionLogEntry> redactionLogEntries,
+                                                                             ImportedRedactions importedRedactions) {
+
+        for (List<ImportedRedaction> importedRedactionsValues : importedRedactions.getImportedRedactions().values()) {
+            for (ImportedRedaction importedRedaction : importedRedactionsValues) {
+                RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
+                        .id(importedRedaction.getId())
+                        .type(IMPORTED_REDACTION_TYPE)
+                        .imported(true)
+                        .redacted(true)
+                        .positions(importedRedaction.getPositions())
+                        .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
+                        .build();
+
+                redactionLogEntries.add(redactionLogEntry);
            }
+        }

-            loop:
-            for (ImportedAnnotation importedAnnotation : importedAnnotations) {
-                for (com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle importedPosition : importedAnnotation.getPositions()) {
-                    for (Rectangle rectangle : redactionLogEntry.getPositions()) {
-                        if (intersects(importedPosition, rectangle)) {
-                            mustBeRemoved = true;
-                            break loop;
+        return redactionLogEntries;
+    }
+
+
+    private void addIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
+
+        for (Rectangle rectangle : redactionLogEntry.getPositions()) {
+            var normalizedRectangle = normalize(rectangle);
+            if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
+                var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPage());
+                for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
+                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
+                        if (rectOverlap(normalizedRectangle, normalize(importedRedactionPosition))) {
+                            if (redactionLogEntry.getImportedRedactionIntersections() == null) {
+                                redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
+                            }
+                            redactionLogEntry.getImportedRedactionIntersections().add(importedRedaction.getId());
                        }
                    }
                }
            }
-            if (mustBeRemoved) {
-                itty.remove();
-            }
-        }
-
-        for (ImportedAnnotation importedAnnotation : importedAnnotations) {
-            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
-                    .id(importedAnnotation.getAnnotationId())
-                    .type("imported_redaction")
-                    .redacted(importedAnnotation.getStatus().equals(ImportedAnnotationStatus.DECLINED) ? false : true)
-                    .positions(importedAnnotation.getPositions()
-                            .stream()
-                            .map(this::convert)
-                            .collect(Collectors.toList()))
-                    .color(getColor("imported_redaction", dossierTemplateId, importedAnnotation.getStatus().equals(ImportedAnnotationStatus.DECLINED) ? false : true))
-                    .build();
-
-            redactionLog.getRedactionLogEntry().add(redactionLogEntry);
        }
    }


-    public Rectangle convert(
-            com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle importedPosition) {
+    boolean valueInRange(float value, float min, float max) {

-        return new Rectangle(new Point(importedPosition.getTopLeftX(), importedPosition.getTopLeftY()), importedPosition.getWidth(), importedPosition.getHeight(), importedPosition.getPage());
+        return round(value) >= round(min) && round(value) <= round(max);
    }


-    public boolean intersects(
-            com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle importedPosition,
-            Rectangle redactionLogPosition) {
+    boolean rectOverlap(Rectangle a, Rectangle b) {

-        return importedPosition.getPage() == redactionLogPosition.getPage() && redactionLogPosition.getTopLeft()
-                .getX() + redactionLogPosition.getWidth() > importedPosition.getTopLeftX() && redactionLogPosition.getTopLeft()
-                .getY() + redactionLogPosition.getHeight() > importedPosition.getTopLeftY() && redactionLogPosition.getTopLeft()
-                .getX() < importedPosition.getTopLeftX() + importedPosition.getWidth() && redactionLogPosition.getTopLeft()
-                .getY() < importedPosition.getTopLeftY() + importedPosition.getHeight();
+        boolean xOverlap = valueInRange(a.getTopLeft().getX(), b.getTopLeft().getX(), b.getTopLeft()
+                .getX() + b.getWidth()) || valueInRange(b.getTopLeft().getX(), a.getTopLeft().getX(), a.getTopLeft()
+                .getX() + a.getWidth());
+
+        boolean yOverlap = valueInRange(a.getTopLeft().getY(), b.getTopLeft().getY(), b.getTopLeft()
+                .getY() + b.getHeight()) || valueInRange(b.getTopLeft().getY(), a.getTopLeft().getY(), a.getTopLeft()
+                .getY() + a.getHeight());
+
+        return xOverlap && yOverlap;
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {
+    private Rectangle normalize(Rectangle rectangle) {

-        if (!isRedaction) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        Rectangle r = new Rectangle();
+        Point p = new Point();
+
+        if (rectangle.getWidth() < 0) {
+            p.setX(rectangle.getTopLeft().getX() + rectangle.getWidth());
+            r.setWidth(Math.abs(rectangle.getWidth()));
+        } else {
+            p.setX(rectangle.getTopLeft().getX());
+            r.setWidth(rectangle.getWidth());
        }
+
+        if (rectangle.getHeight() < 0) {
+            p.setY(rectangle.getTopLeft().getY() + rectangle.getHeight());
+            r.setHeight(Math.abs(rectangle.getHeight()));
+        } else {
+            p.setY(rectangle.getTopLeft().getY());
+            r.setHeight(rectangle.getHeight());
+        }
+
+        r.setTopLeft(p);
+        r.setPage(rectangle.getPage());
+        return r;
+    }
+
+
+    private float round(float value) {
+
+        double d = Math.pow(10, 0);
+        return (float) (Math.round(value * d) / d);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
        return dictionaryService.getColor(type, dossierTemplateId);
    }

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

+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.model.SectionArea;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
@@ -11,16 +18,15 @@ import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;

@Slf4j
@Service
@@ -30,16 +36,16 @@ public class ManualRedactionSurroundingTextService {
    private final RedactionStorageService redactionStorageService;
    private final SurroundingWordsService surroundingWordsService;

+    @Timed("redactmanager_SurroundingTextAnalysis")
+    public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {

-    public ManualRedactions addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
-
+        long startTime = System.currentTimeMillis();
        Text text = redactionStorageService.getText(dossierId, fileId);
        List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
-        List<ManualResizeRedaction> processedResizeRedactions = new ArrayList<>();

        for (SectionText sectionText : text.getSectionTexts()) {

-            if (manualRedactions.getEntriesToAdd().isEmpty() && manualRedactions.getResizeRedactions().isEmpty()) {
+            if (manualRedactions.getEntriesToAdd().isEmpty()) {
                break;
            }

@@ -49,42 +55,32 @@ public class ManualRedactionSurroundingTextService {
                while (addItty.hasNext()) {
                    var manualAddRedaction = addItty.next();
                    if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction
-                                .getPositions());
+                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
                        manualAddRedaction.setTextBefore(surroundingText.getLeft());
                        manualAddRedaction.setTextAfter(surroundingText.getRight());
                        processedAddRedactions.add(manualAddRedaction);
                        addItty.remove();
                    }
                }
-
-                var resizeItty = manualRedactions.getResizeRedactions().iterator();
-                while (resizeItty.hasNext()) {
-                    var manualResizeRedaction = resizeItty.next();
-                    if (sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction
-                                .getPositions());
-                        manualResizeRedaction.setTextBefore(surroundingText.getLeft());
-                        manualResizeRedaction.setTextAfter(surroundingText.getRight());
-                        processedResizeRedactions.add(manualResizeRedaction);
-                        resizeItty.remove();
-                    }
-                }
            }
        }

        manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
-        manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
-        return manualRedactions;
+
+        return AnalyzeResult.builder()
+                .dossierId(dossierId)
+                .fileId(fileId)
+                .manualRedactions(manualRedactions)
+                .duration(System.currentTimeMillis() - startTime)
+                .build();
    }


    private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
                                                     List<Rectangle> toFindPositions) {

-        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText
-                .getSectionNumber(), false, false, Engine.DICTIONARY, false);
-        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
+        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), new SearchImplementation(value, false), new FindEntityDetails("dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, EntityType.ENTITY));
+        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null, null);

        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);

@@ -94,8 +90,7 @@ public class ManualRedactionSurroundingTextService {
        }

        if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText
-                    .getCellStarts());
+            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText.getCellStarts());
        } else {
            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null);
        }
@@ -1,53 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.server.client.EntityRecognitionClient;
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
-import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionSection;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.stereotype.Service;
-
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class NerAnalyserService {
-
-    private final RedactionStorageService redactionStorageService;
-    private final EntityRecognitionClient entityRecognitionClient;
-    private final RedactionServiceSettings redactionServiceSettings;
-
-    public void computeNerEntities(String dossierId, String fileId) {
-
-        if (redactionServiceSettings.isEnableEntityRecognition()) {
-            var text = redactionStorageService.getText(dossierId, fileId);
-
-            long start = System.currentTimeMillis();
-
-            if (text != null) {
-                var nerRequest = EntityRecognitionRequest.builder()
-                        .data(text.getSectionTexts()
-                                .stream()
-                                .map(sectionText -> new EntityRecognitionSection(sectionText.getSectionNumber(), new String(Base64
-                                        .encodeBase64(sectionText
-                                                .getText().getBytes()))))
-                                .collect(Collectors.toList()))
-                        .build();
-
-                var nerResponse = entityRecognitionClient.findAuthors(nerRequest);
-
-                log.info("Computing NER entities took: {} ms for dossierId {} and fileId {}", System.currentTimeMillis() - start, dossierId, fileId);
-
-                redactionStorageService.storeObject(dossierId, fileId, FileType.NER_ENTITIES, nerResponse);
-            } else {
-                log.warn("Warning, text for file: {} in dossier: {} is null", fileId, dossierId);
-            }
-        }
-    }
-
-}
@@ -2,6 +2,8 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;

 import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,7 @@ public class RedactionChangeLogService {
    private final RedactionStorageService redactionStorageService;


+    @Timed("redactmanager_computeChanges")
    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog, int analysisNumber) {

        long start = System.currentTimeMillis();
@@ -1,5 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
@@ -7,16 +17,14 @@ 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.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;

@Service
@Slf4j
@@ -26,6 +34,7 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


+    @Timed("redactmanager_createRedactionLog")
    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
                                                      String dossierTemplateId) {

@@ -85,7 +94,7 @@ public class RedactionLogCreatorService {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

-        // Duplicates can exist due table extraction colums over multiple rows.
+        // Duplicates can exist due table extraction columns over multiple rows.
        Set<String> processedIds = new HashSet<>();

        entityLoop:
@@ -197,7 +206,8 @@ public class RedactionLogCreatorService {
                .type(entity.getType())
                .redacted(entity.isRedaction())
                .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
+                .isRecommendation(entity.getEntityType().equals(EntityType.RECOMMENDATION))
+                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -227,10 +237,4 @@ public class RedactionLogCreatorService {
        return dictionaryService.isHint(type, dossierTemplateId);
    }

-
-    private boolean isRecommendation(String type, String dossierTemplateId) {
-
-        return dictionaryService.isRecommendation(type, dossierTemplateId);
-    }
-
 }
@@ -1,38 +1,106 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.awt.Color;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
-import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.model.ManualChange;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogComment;
+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.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.stream.Collectors;

@Slf4j
@Service
@RequiredArgsConstructor
 public class RedactionLogMergeService {

-    private final DictionaryService dictionaryService;
-
+    private static final String DELETED_TYPE_COLOR = "#9398a0";
    private final SectionTextService sectionTextService;

+    private final RedactionStorageService redactionStorageService;

-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                              String dossierTemplateId, ManualRedactions manualRedactions,
-                                              Set<Integer> excludedPages) {

+    @Timed("redactmanager_getMergedRedactionLog")
+    public RedactionLog provideRedactionLog(RedactionRequest redactionRequest) {
+
+        log.debug("Requested preview for: {}", redactionRequest);
+
+        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+        if (redactionLog == null) {
+            throw new NotFoundException("RedactionLog not present");
+        }
+
+        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
+        if (sectionGrid.getSections().isEmpty()) {
+
+            log.info("SectionGrid does not have headlines set. Computing headlines now!");
+            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+            // enhance section grid with headline data
+            for (var sectionText : text.getSectionTexts()) {
+                sectionGrid.getSections()
+                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
+                                .stream()
+                                .map(SectionArea::getPage)
+                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
+            }
+            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
+        }
+
+        log.debug("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        var merged = mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages(), redactionRequest.getTypes(), redactionRequest.getColors());
+
+        merged.getRedactionLogEntry().removeIf(e -> e.isFalsePositive() && !redactionRequest.isIncludeFalsePositives());
+
+        return merged;
+    }
+
+
+    private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
+                                               ManualRedactions manualRedactions, Set<Integer> excludedPages,
+                                               List<Type> types, Colors colors) {
+
+        var skippedImportedRedactions = new HashSet<>();
        log.info("Merging Redaction log with manual redactions");
        if (manualRedactions != null) {

-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types);

            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);

@@ -42,9 +110,13 @@ public class RedactionLogMergeService {

                processRedactionLogEntry(manualRedactionWrappers.stream()
                        .filter(mr -> entry.getId().equals(mr.getId()))
-                        .collect(Collectors.toList()), dossierTemplateId, entry);
+                        .collect(Collectors.toList()), entry, types, colors);

-                entry.setComments(manualRedactions.getComments().get(entry.getId()));
+                if (entry.isImported() && !entry.isRedacted()) {
+                    skippedImportedRedactions.add(entry.getId());
+                }
+
+                entry.setComments(convert(manualRedactions.getComments().get(entry.getId())));

                if (excludedPages != null && !excludedPages.isEmpty()) {
                    entry.getPositions().forEach(pos -> {
@@ -59,6 +131,15 @@ public class RedactionLogMergeService {

        Set<String> processedIds = new HashSet<>();
        redactionLog.getRedactionLogEntry().removeIf(entry -> {
+
+            if (entry.getImportedRedactionIntersections() != null) {
+                entry.getImportedRedactionIntersections().removeAll(skippedImportedRedactions);
+                if (!entry.getImportedRedactionIntersections()
+                        .isEmpty() && (!entry.isImage() || entry.isImage() && !(entry.getType()
+                        .equals("image") || entry.getType().equals("ocr")))) {
+                    return true;
+                }
+            }
            if (processedIds.contains(entry.getId())) {
                log.info("Duplicate annotation found with id {}", entry.getId());
                return true;
@@ -111,7 +192,7 @@ public class RedactionLogMergeService {


    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
-                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+                                          RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors) {

        manualRedactionWrappers.forEach(mrw -> {

@@ -120,11 +201,10 @@ public class RedactionLogMergeService {
                String manualOverrideReason = null;
                if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {

-
                    redactionLogEntry.setType(imageRecategorization.getType());
                    redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());

-                    if (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
+                    if (isHint(types, imageRecategorization.getType())) {
                        redactionLogEntry.setRedacted(false);
                        redactionLogEntry.setHint(true);
                    } else {
@@ -134,44 +214,50 @@ public class RedactionLogMergeService {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
                } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                }

-                redactionLogEntry.setReason(manualOverrideReason);
+                if(manualOverrideReason != null) {
+                    redactionLogEntry.setReason(manualOverrideReason);
+                }

-                redactionLogEntry.getManualChanges().add(ManualChange.from(imageRecategorization)
-                        .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
-                        .withChange("type", imageRecategorization.getType()));
+                redactionLogEntry.getManualChanges()
+                        .add(ManualChange.from(imageRecategorization)
+                                .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
+                                .withChange("type", imageRecategorization.getType()));
            }

            if (mrw.getItem() instanceof IdRemoval) {
                var manualRemoval = (IdRemoval) mrw.getItem();
-                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
+                if (manualRemoval.getStatus()
+                        .equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
                    log.debug("Skipping merge for dictionary-modifying entry");
                } else {
                    String manualOverrideReason = null;
                    if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
                        redactionLogEntry.setRedacted(false);
                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), true, types));
                        redactionLogEntry.setHint(false);
                    } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                    }

-                    redactionLogEntry.setReason(manualOverrideReason);
+                    if(manualOverrideReason != null) {
+                        redactionLogEntry.setReason(manualOverrideReason);
+                    }

-                    redactionLogEntry.getManualChanges().add(ManualChange.from(manualRemoval)
-                            .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ?
-                                    ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+                    redactionLogEntry.getManualChanges()
+                            .add(ManualChange.from(manualRemoval)
+                                    .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
                }
            }

            if (mrw.getItem() instanceof ManualForceRedaction) {
                var manualForceRedact = (ManualForceRedaction) mrw.getItem();
                String manualOverrideReason = null;
-                var dictionaryIsHint = dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId);
+                var dictionaryIsHint = isHint(types, redactionLogEntry.getType());
                if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
                    // Forcing a skipped hint should result in a hint
                    if (dictionaryIsHint) {
@@ -179,16 +265,19 @@ public class RedactionLogMergeService {
                    } else {
                        redactionLogEntry.setRedacted(true);
                    }
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force " + (dictionaryIsHint ? "hint" : "redact"));
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                }

-                redactionLogEntry.setReason(manualOverrideReason);
+                if(manualOverrideReason != null) {
+                    redactionLogEntry.setReason(manualOverrideReason);
+                }
+
                var manualChange = ManualChange.from(manualForceRedact)
                        .withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);

@@ -211,10 +300,12 @@ public class RedactionLogMergeService {
                    }
                } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                }

-                redactionLogEntry.setReason(manualOverrideReason);
+                if(manualOverrideReason != null) {
+                    redactionLogEntry.setReason(manualOverrideReason);
+                }

                var manualChange = ManualChange.from(manualLegalBasisChange)
                        .withManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
@@ -232,24 +323,33 @@ public class RedactionLogMergeService {
                var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
                String manualOverrideReason = null;
                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                    redactionLogEntry.setValue(manualResizeRedact.getValue());
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+
+                    // This is for backwards compatibility, now the text after/before is calculated during reanalysis because we need to find dict entries on positions where entries are resized to smaller.
+                    if (manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
+                        redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                        redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                    }
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
                } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+
+                    // This is for backwards compatibility, now the text after/before is calculated during reanalysis because we need to find dict entries on positions where entries are resized to smaller.
+                    if (manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
+                        redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                        redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                    }
                }

                redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.getManualChanges().add(ManualChange.from(manualResizeRedact)
-                        .withManualRedactionType(ManualRedactionType.RESIZE)
-                        .withChange("value", manualResizeRedact.getValue()));
+                redactionLogEntry.getManualChanges()
+                        .add(ManualChange.from(manualResizeRedact)
+                                .withManualRedactionType(ManualRedactionType.RESIZE)
+                                .withChange("value", manualResizeRedact.getValue()));
            }

        });
@@ -271,16 +371,17 @@ public class RedactionLogMergeService {


    public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
+                                                       Map<String, List<Comment>> comments, Colors colors,
+                                                       List<Type> types) {

        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();

        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {

-            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
+            if (shouldCreateManualEntry(manualRedactionEntry)) {
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), colors, types);
                redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
-                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
+                redactionLogEntry.setComments(convert(comments.get(manualRedactionEntry.getAnnotationId())));
                redactionLogEntry.setTextBefore(manualRedactionEntry.getTextBefore());
                redactionLogEntry.setTextAfter(manualRedactionEntry.getTextAfter());

@@ -294,6 +395,14 @@ public class RedactionLogMergeService {
    }


+    private List<RedactionLogComment> convert(List<Comment> comments) {
+
+        return comments == null ? null : comments.stream()
+                .map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(), c.getFileId(), c.getDate(), c.getSoftDeletedTime()))
+                .collect(Collectors.toList());
+    }
+
+
    private List<Rectangle> convertPositions(
            List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {

@@ -303,66 +412,108 @@ public class RedactionLogMergeService {
    }


-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+    @SuppressWarnings("PMD.UselessParentheses")
+    private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) {

-        return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) &&
-                manualRedactionEntry.getProcessedDate() != null &&
-                (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+        return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary()) || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()) && manualRedactionEntry.getProcessedDate() == null);
    }


    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String dossierTemplateId) {
+                                                      Colors colors, List<Type> types) {

        var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();

+        var change = ManualChange.from(manualRedactionEntry)
+                .withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY);
+        List<ManualChange> changeList = new ArrayList<>();
+        changeList.add(change);
+
        return RedactionLogEntry.builder()
                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), colors, manualRedactionEntry.getStatus(), types))
                .reason(manualRedactionEntry.getReason())
                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                .legalBasis(manualRedactionEntry.getLegalBasis())
                .value(manualRedactionEntry.getValue())
+                .sourceId(manualRedactionEntry.getSourceId())
                .section(manualRedactionEntry.getSection())
                .type(manualRedactionEntry.getType())
                .redacted(true)
                .isHint(false)
                .sectionNumber(-1)
                .rectangle(manualRedactionEntry.isRectangle())
-                .manualChanges(List.of(ManualChange.from(manualRedactionEntry)
-                        .withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY)))
+                .manualChanges(changeList)
                .build();
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
-                             boolean skipped) {
+    private float[] getColor(String type, Colors colors, boolean requested, boolean isRedaction, boolean skipped,
+                             List<Type> types) {

        if (requested) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
+            return convertColor(colors.getRequestRemoveColor());
        }
-        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        if (skipped || !isRedaction && !isHint(types, type)) {
+            return convertColor(colors.getSkippedColor());
        }
-        return dictionaryService.getColor(type, dossierTemplateId);
+        return getColor(types, type);
    }


-    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {
+    private float[] getColorForManualAdd(String type, Colors colors, AnnotationStatus status, List<Type> types) {

        if (status.equals(AnnotationStatus.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(dossierTemplateId);
+            return convertColor(colors.getRequestAddColor());
        } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+            return convertColor(colors.getSkippedColor());
        }
-        return getColor(type, dossierTemplateId);
+        return getColor(types, type);
    }


-    private float[] getColor(String type, String dossierTemplateId) {
+    private float[] getColor(List<Type> types, String type) {

-        return dictionaryService.getColor(type, dossierTemplateId);
+        var matchingTypes = getMatchingTypes(types, type);
+        Optional<Type> foundAndNotDeletedType = matchingTypes.stream().filter(t -> !isDeletedType(t)).findFirst();
+        if (foundAndNotDeletedType.isPresent()) {
+            return convertColor(foundAndNotDeletedType.get().getHexColor());
+        }
+        Optional<Type> firstDeletedType = matchingTypes.stream().findFirst();
+        return firstDeletedType.map(value -> convertColor(value.getHexColor()))
+                .orElseGet(() -> convertColor(DELETED_TYPE_COLOR));
+    }
+
+
+    boolean isHint(List<Type> types, String type) {
+
+        var matchingTypes = getMatchingTypes(types, type);
+        Optional<Type> foundAndNotDeletedType = matchingTypes.stream().filter(t -> !isDeletedType(t)).findFirst();
+        if (foundAndNotDeletedType.isPresent()) {
+            return foundAndNotDeletedType.get().isHint();
+        }
+        Optional<Type> firstDeletedType = matchingTypes.stream().findFirst();
+        return firstDeletedType.map(Type::isHint).orElse(false);
+    }
+
+
+    private float[] convertColor(String hex) {
+
+        Color color = Color.decode(hex);
+        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
+    }
+
+
+    private List<Type> getMatchingTypes(List<Type> types, String type) {
+
+        return types.stream().filter(t -> t.getType().equals(type)).collect(Collectors.toList());
+    }
+
+
+    private boolean isDeletedType(Type type) {
+
+        return type.getSoftDeletedTime() != null;
    }


@@ -46,7 +46,7 @@ public class SectionGridCreatorService {
                            .getRectanglesPerPage()
                            .computeIfAbsent(page, (x) -> new ArrayList<>())
                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(),null));

                } else if (textBlock instanceof Table) {

@@ -79,7 +79,7 @@ public class SectionTextBuilderService {
                        .get(0)
                        .getSequences()
                        .get(0)
-                        .getPage());
+                        .getPage(), null);
                sectionText.getSectionAreas().add(sectionArea);
                sectionText.getTextBlocks().addAll(cell.getTextBlocks());

@@ -141,7 +141,7 @@ public class SectionTextBuilderService {
                        .get(0)
                        .getSequences()
                        .get(0)
-                        .getPage());
+                        .getPage(), null);
                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
                sectionText.getSectionAreas().add(sectionArea);

@@ -171,11 +171,11 @@ public class SectionTextBuilderService {
        SectionText sectionText = new SectionText();
        for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
            SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
-                    .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
+                    .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage(), null);
            sectionText.getSectionAreas().add(sectionArea);
        }

-        sectionText.setText(searchableText.toString());
+        sectionText.setText(searchableText.asString());
        sectionText.setHeadline(headline);
        sectionText.setSectionNumber(sectionNumber.intValue());
        sectionText.setTable(false);
@@ -4,6 +4,8 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@ public class SurroundingWordsService {
    private final RedactionServiceSettings redactionServiceSettings;


+    @Timed("redactmanager_addSurroundingText")
    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary) {

        if (entities.isEmpty()) {
@@ -31,7 +34,7 @@ public class SurroundingWordsService {
                if (dictionary != null && dictionary.isHint(entity.getType())) {
                    continue;
                }
-                findSurroundingWords(entity, searchableText.toString(), entity.getStart(), entity.getEnd());
+                findSurroundingWords(entity, searchableText.asString(), entity.getStart(), entity.getEnd());
            }
        } catch (Exception e) {
            log.warn("Could not get surrounding text!");
@@ -39,6 +42,7 @@ public class SurroundingWordsService {
    }


+    @Timed("redactmanager_addSurroundingText_tables")
    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary,
                                   List<Integer> cellstarts) {

@@ -47,7 +51,7 @@ public class SurroundingWordsService {
        }

        try {
-            String searchableString = searchableText.toString();
+            String searchableString = searchableText.asString();

            if (cellstarts != null) {
                for (int i = 0; i < cellstarts.size(); i++) {
@@ -5,18 +5,19 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;

-import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;

 import lombok.experimental.UtilityClass;
@@ -27,68 +28,48 @@ import lombok.extern.slf4j.Slf4j;
@SuppressWarnings("PMD")
 public class EntitySearchUtils {

-    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {

-        String inputString = sectionText.toLowerCase(Locale.ROOT);
-
-        for (DictionaryIncrementValue value : values) {
-
-            String cleanValue = value.getValue().toLowerCase(Locale.ROOT).trim();
-
-            if (cleanValue.length() <= 2) {
-                continue;
-            }
-
-            int startIndex;
-            int stopIndex = 0;
-            do {
-                startIndex = inputString.indexOf(cleanValue, stopIndex);
-                stopIndex = startIndex + cleanValue.length();
-
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    return true;
-                }
-            } while (startIndex > -1);
-        }
-        return false;
+    public boolean sectionContainsAny(String sectionText, SearchImplementation searchImplementation) {
+        return searchImplementation.atLeastOneMatches(sectionText);
    }

+    public Set<Entity> findEntities(String inputString, SearchImplementation searchImplementation, DictionaryModel type, FindEntityDetails details) {

-    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
-                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine, boolean ignoreMinLength) {
+        Set<Entity> found = find(inputString, searchImplementation, details);

-        Set<Entity> found = new HashSet<>();
-
-        for (String value : values) {
-
-            String cleanValue = value.trim();
-
-            if (!ignoreMinLength && cleanValue.length() <= 2) {
-                continue;
-            }
-
-            int startIndex;
-            int stopIndex = 0;
-            do {
-                startIndex = inputString.indexOf(cleanValue, stopIndex);
-                stopIndex = startIndex + cleanValue.length();
-
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine));
-                }
-            } while (startIndex > -1);
+        if (details.getEntityType() == EntityType.RECOMMENDATION) {
+            Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationsSearch(), details.withEntityType(EntityType.FALSE_RECOMMENDATION));
+            removeFalsePositives(found, falseRecommendations);
+            found.addAll(falseRecommendations);
+        } else {
+            Set<Entity> falsePositives = find(inputString, type.getFalsePositiveSearch(), details.withEntityType(EntityType.FALSE_POSITIVE));
+            removeFalsePositives(found, falsePositives);
+            found.addAll(falsePositives);
        }
+
        return found;
    }

+    public Set<Entity> find(String inputString, SearchImplementation searchImplementation, FindEntityDetails findEntityDetails) {
+        Set<Entity> entities = new HashSet<>();

-    private boolean isSeparator(char c) {
+        searchImplementation.getMatches(inputString).forEach(match -> validateAndAddEntity(entities, findEntityDetails, inputString, match.getStartIndex(), match.getEndIndex()));

-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+        return entities;
+    }
+
+    private void validateAndAddEntity(Set<Entity> entities, FindEntityDetails findEntityDetails, String inputString, int startIndex, int stopIndex) {
+
+        if ((startIndex == 0 || SeparatorUtils.isSeparator(inputString.charAt(startIndex - 1)))
+                && (stopIndex == inputString.length() || SeparatorUtils.isSeparator(inputString.charAt(stopIndex)))) {
+            entities.add(new Entity(inputString.substring(startIndex, stopIndex), findEntityDetails.getType(), startIndex, stopIndex,
+                    findEntityDetails.getHeadline(), findEntityDetails.getSectionNumber(), findEntityDetails.isDictionaryEntry(),
+                    findEntityDetails.isDossierDictionary(), findEntityDetails.getEngine(), findEntityDetails.getEntityType()));
+        }
    }


-    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary, ManualRedactions manualRedactions) {

        Map<String, List<Entity>> entitiesByWord = new HashMap<>();

@@ -98,13 +79,10 @@ public class EntitySearchUtils {

        for (String word : entitiesByWord.keySet()) {

-            List<Entity> orderedEntities = entitiesByWord.get(word)
-                    .stream()
-                    .sorted(Comparator.comparing(Entity::getStart))
-                    .collect(Collectors.toList());
+            List<Entity> orderedEntities = entitiesByWord.get(word).stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
            Entity firstEntity = orderedEntities.get(0);
            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
-                    .trim(), dictionary == null ? true : dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
+                    .trim(), dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());

            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                try {
@@ -115,12 +93,60 @@ public class EntitySearchUtils {
            }
        }

+        if (manualRedactions != null && manualRedactions.getResizeRedactions() != null && !manualRedactions.getResizeRedactions().isEmpty()){
+            applyResizeRedactions(entities, manualRedactions);
+        }
+
        removeEntitiesContainedInLarger(entities);

        return entities;
    }


+    private void applyResizeRedactions(Set<Entity> entitiesWithPositions, ManualRedactions manualRedactions) {
+
+        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()) {
+            return;
+        }
+
+        entitiesWithPositions.forEach(e -> e.getPositionSequences()
+                .forEach(pos -> manualRedactions.getResizeRedactions().stream().filter(resize -> resize.getStatus().equals(AnnotationStatus.APPROVED)).forEach(resize -> {
+                    if (resize.getAnnotationId().equals(pos.getId())) {
+                        if (resize.getValue().length() < e.getWord().length() && e.getWord().contains(resize.getValue())) {
+                            int start = e.getWord().indexOf(resize.getValue());
+                            e.setStart(e.getStart() + start);
+                            e.setEnd(e.getStart() + resize.getValue().length());
+                            e.setResized(true);
+                            e.setWord(resize.getValue());
+                        } else if (resize.getValue().length() > e.getWord().length() && resize.getValue().contains(e.getWord())) {
+                            int start = resize.getValue().indexOf(e.getWord());
+                            e.setStart(e.getStart() - start);
+                            e.setEnd(e.getStart() + resize.getValue().length());
+                            e.setResized(true);
+                            e.setWord(resize.getValue());
+                        }
+                    }
+                })));
+
+    }
+
+
+    public void removeFalsePositives(Set<Entity> entities, Set<Entity> falsePositives) {
+
+        List<Entity> wordsToRemove = new ArrayList<>();
+        for (Entity word : falsePositives) {
+            for (Entity inner : entities) {
+                if (inner.getWord().length() < word.getWord()
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
+                    wordsToRemove.add(inner);
+                }
+            }
+        }
+        wordsToRemove.forEach(entities::remove);
+        entities.removeAll(falsePositives);
+    }
+
+
    public void removeEntitiesContainedInLarger(Set<Entity> entities) {

        List<Entity> wordsToRemove = new ArrayList<>();
@@ -128,11 +154,48 @@ public class EntitySearchUtils {
            for (Entity inner : entities) {
                if (inner.getWord().length() < word.getWord()
                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
-                    wordsToRemove.add(inner);
+                    if (word.getEntityType().equals(EntityType.RECOMMENDATION) && inner.getEntityType().equals(EntityType.ENTITY)) {
+                        wordsToRemove.add(word);
+                    } else if(!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
+                            inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
+                        if(inner.isResized()){
+                            wordsToRemove.add(word);
+                        } else {
+                            wordsToRemove.add(inner);
+                        }
+                    }
                }
            }
        }
-        entities.removeAll(wordsToRemove);
+        wordsToRemove.stream().filter(e -> !e.getEntityType().equals(EntityType.FALSE_POSITIVE) && !e.getEntityType().equals(EntityType.FALSE_RECOMMENDATION)).forEach(entities::remove);
+    }
+
+
+    public static void removeEntitiesContainedInRedactedLogos(Map<Integer, Set<Image>> imagesPerPage, Map<Integer, List<Entity>> entitiesPerPage) {
+
+        if (entitiesPerPage != null && imagesPerPage != null) {
+            for (int page : imagesPerPage.keySet()) {
+                Set<Entity> removeEntitiesFromPage = new HashSet<>();
+
+                if (!entitiesPerPage.containsKey(page)) {
+                    continue;
+                }
+                imagesPerPage.get(page).forEach(image -> {
+                    if (image.isRedaction()) {
+                        entitiesPerPage.get(page).forEach(entity -> {
+                            if (isImageOverlappingEntity(image, entity)) {
+                                log.info("Logo overlaps entity and entity will be removed");
+                                removeEntitiesFromPage.add(entity);
+                            }
+
+                        });
+                    }
+                });
+
+                entitiesPerPage.get(page).removeAll(removeEntitiesFromPage);
+
+            }
+        }
    }


@@ -146,13 +209,23 @@ public class EntitySearchUtils {

        if (entities.contains(found)) {
            Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if (!existingOptional.isPresent()) {
+            if (existingOptional.isEmpty()) {
                return;
            }
            var existing = existingOptional.get();

            if (existing.getType().equals(found.getType())) {
                existing.getEngines().addAll(found.getEngines());
+                existing.setLegalBasis(found.getLegalBasis());
+                existing.setMatchedRule(found.getMatchedRule());
+                existing.setRedactionReason(found.getRedactionReason());
+                if (existing.getEntityType().equals(EntityType.RECOMMENDATION) && found.getEntityType().equals(EntityType.ENTITY)
+                        || existing.getEntityType().equals(EntityType.ENTITY) && found.getEntityType().equals(EntityType.RECOMMENDATION)) {
+                    existing.setEntityType(EntityType.ENTITY);
+                    if (found.isRedaction()) {
+                        existing.setRedaction(true);
+                    }
+                }
            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
                entities.remove(found);
                entities.add(found);
@@ -170,22 +243,17 @@ public class EntitySearchUtils {
    }


-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
+    private boolean isImageOverlappingEntity(Image image, Entity entity) {

-        for (Entity toAdd : toBeAdded) {
-            if (existing.contains(toAdd)) {
-                Optional<Entity> existingOptional = existing.stream()
-                        .filter(entity -> entity.equals(toAdd))
-                        .findFirst();
-                if (!existingOptional.isPresent()) {
-                    return;
-                }
-                var existingEntity = existingOptional.get();
-                existingEntity.getEngines().addAll(toAdd.getEngines());
-            } else {
-                existing.add(toAdd);
-            }
-        }
+        return image.getPosition() != null && entity.getPositionSequences() != null && entity.getPositionSequences().get(0) != null && entity.getPositionSequences()
+                .get(0)
+                .getSequences() != null && entity.getPositionSequences().get(0).getSequences().get(0) != null && image.getPosition().getX() < entity.getPositionSequences()
+                .get(0)
+                .getSequences()
+                .get(0)
+                .getX1() && image.getPosition().getX() + image.getPosition().getWidth() > entity.getPositionSequences().get(0).getSequences().get(0).getX2() && image.getPosition()
+                .getY() < entity.getPositionSequences().get(0).getSequences().get(0).getY1() && image.getPosition().getY() + image.getPosition()
+                .getHeight() > entity.getPositionSequences().get(0).getSequences().get(0).getY2();
    }


@@ -205,11 +273,35 @@ public class EntitySearchUtils {
    }


+    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
+
+        for (Entity toAdd : toBeAdded) {
+            if (existing.contains(toAdd)) {
+                Optional<Entity> existingOptional = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
+                if (existingOptional.isEmpty()) {
+                    return;
+                }
+                var existingEntity = existingOptional.get();
+                existingEntity.getEngines().addAll(toAdd.getEngines());
+                existingEntity.setLegalBasis(toAdd.getLegalBasis());
+                existingEntity.setMatchedRule(toAdd.getMatchedRule());
+                existingEntity.setRedactionReason(toAdd.getRedactionReason());
+            } else {
+                existing.add(toAdd);
+            }
+        }
+    }
+
+    /*
+     * returns true if the found entity overlaps with an existing entity in a way
+     * that neither entity is a subset of the other
+     */
    private boolean overlaps(Set<Entity> existingEntities, Entity found) {

        for (Entity existing : existingEntities) {

-            if(existing.getStart().equals(found.getStart())){
+            // skip if either start or end is equal
+            if (existing.getStart().equals(found.getStart()) || existing.getEnd().equals(found.getEnd())) {
                continue;
            }

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class FindEntityDetails {
+
+    private String type;
+    private String headline;
+    private int sectionNumber;
+    private boolean isDictionaryEntry;
+    private boolean isDossierDictionary;
+    private Engine engine;
+    private EntityType entityType;
+
+    public FindEntityDetails withEntityType(EntityType entityType) {
+        this.entityType = entityType;
+        return this;
+    }
+}
@@ -0,0 +1,92 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.ahocorasick.trie.Trie;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+@Data
+public class SearchImplementation {
+
+    private boolean ignoreCase;
+    private List<String> values;
+
+    private Pattern pattern;
+    private Trie trie;
+
+    public SearchImplementation(String value, boolean ignoreCase) {
+        this.values = List.of(value);
+        this.ignoreCase = ignoreCase;
+        this.createSearchImplementation();
+    }
+
+    public SearchImplementation(Collection<String> values, boolean ignoreCase) {
+        this.values = new ArrayList<>(values);
+        this.ignoreCase = ignoreCase;
+        this.createSearchImplementation();
+    }
+
+    private void createSearchImplementation() {
+        if (this.values.isEmpty()) {
+            return;
+        }
+
+        if (this.values.size() == 1) {
+            var text = this.values.iterator().next();
+            this.pattern = Pattern.compile(Pattern.quote(ignoreCase ? text.toLowerCase(Locale.ROOT) : text));
+        } else {
+            var builder = Trie.builder();
+            if (this.ignoreCase) {
+                builder.ignoreCase();
+            }
+
+            builder.addKeywords(this.values);
+
+            this.trie = builder.build();
+        }
+    }
+
+    public boolean atLeastOneMatches(String text) {
+        String textToCheck = text;
+        if (this.values.isEmpty()) {
+            return false;
+        }
+        if (this.pattern != null) {
+            if (ignoreCase) {
+                textToCheck = textToCheck.toLowerCase(Locale.ROOT);
+            }
+            return this.pattern.matcher(textToCheck).results().findAny().isPresent();
+        } else {
+            return this.trie.containsMatch(textToCheck);
+        }
+
+    }
+
+    public List<MatchPosition> getMatches(String text) {
+        String textToCheck = text;
+        if (this.values.isEmpty()) {
+            return new ArrayList<>();
+        }
+        if (this.pattern != null) {
+            if (ignoreCase) {
+                textToCheck = textToCheck.toLowerCase(Locale.ROOT);
+            }
+            return this.pattern.matcher(textToCheck).results().map(r -> new MatchPosition(r.start(), r.end())).collect(Collectors.toList());
+        } else {
+            return this.trie.parseText(textToCheck).stream().map(r -> new MatchPosition(r.getStart(), r.getEnd() + 1)).collect(Collectors.toList());
+        }
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class MatchPosition {
+        private int startIndex;
+        private int endIndex;
+    }
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class SeparatorUtils {
+
+    private final static Set<Character> quotes = Set.of('\'', '\u0022', '\u00AB', '\u00BB', '\u2018', '\u2019', '\u201A', '\u201C', '\u201D', '\u201E'
+            , '\u2039', '\u203A');
+
+
+    public static boolean isSeparator(char c) {
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || quotes.contains(c);
+    }
+}
@@ -31,13 +31,15 @@ public class ImageService {
    public Map<Integer, List<PdfImage>> convertImages(String dossierId, String fileId){

        var imageClassificationStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMAGE_INFO));
+
+
        ImageServiceResponse imageServiceResponse = objectMapper.readValue(imageClassificationStream, ImageServiceResponse.class);

        Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getImageMetadata().stream().forEach(imageMetadata -> {
+        imageServiceResponse.getData().forEach(imageMetadata -> {
            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)) : ImageType.OTHER;
            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification, imageMetadata.getPosition().getPageNumber()));
+                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification,imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber()));
        });

        return images;
@@ -26,7 +26,6 @@ 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.service.BlockificationService;
 import com.iqser.red.service.redaction.v1.server.classification.service.ClassificationService;
-import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
 import com.iqser.red.service.redaction.v1.server.parsing.PDFLinesTextStripper;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
@@ -43,8 +42,6 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class PdfSegmentationService {

-    private final static int MAX_PAGES_BEFORE_GC = 250;
-
    private final RulingCleaningService rulingCleaningService;
    private final TableExtractionService tableExtractionService;
    private final BlockificationService blockificationService;
@@ -60,11 +57,10 @@ public class PdfSegmentationService {
            //create tempFile
            File tempFile;

-            if(SystemUtils.IS_OS_UNIX) {
+            if (SystemUtils.IS_OS_UNIX) {
                FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------"));
                tempFile = Files.createTempFile("document", ".pdf", attr).toFile();
-            }
-            else {
+            } else {
                tempFile = Files.createTempFile("document", ".pdf").toFile();
                tempFile.setReadable(true, true);
                tempFile.setWritable(true, true);
@@ -78,15 +74,12 @@ public class PdfSegmentationService {
                Document document = new Document();
                List<Page> pages = new ArrayList<>();

-                pdDocument = reinitializePDDocument(tempFile, null);
+                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(67108864L));
+                pdDocument.setAllSecurityToBeRemoved(true);
                long pageCount = pdDocument.getNumberOfPages();

                for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {

-                    if (pageNumber % MAX_PAGES_BEFORE_GC == 0) {
-                        pdDocument = reinitializePDDocument(tempFile, pdDocument);
-                    }
-
                    PDFLinesTextStripper stripper = new PDFLinesTextStripper();
                    PDPage pdPage = pdDocument.getPage(pageNumber - 1);
                    stripper.setPageNumber(pageNumber);
@@ -107,6 +100,7 @@ public class PdfSegmentationService {
                    Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
                            .getVertical());

+
                    PDRectangle cropbox = pdPage.getCropBox();
                    float cropboxArea = cropbox.getHeight() * cropbox.getWidth();
                    page.setCropBoxArea(cropboxArea);
@@ -134,11 +128,10 @@ public class PdfSegmentationService {
                sectionsBuilderService.buildSections(document);
                sectionsBuilderService.addImagesToSections(document);

-                pdDocument = reinitializePDDocument(tempFile, pdDocument);

                IOUtils.close(pdDocument);

-                if(!tempFile.delete()){
+                if (!tempFile.delete()) {
                    log.warn("Could not delete tmp file");
                }

@@ -152,23 +145,6 @@ public class PdfSegmentationService {
    }


-    private PDDocument reinitializePDDocument(File tempFile, PDDocument pdDocument) throws IOException {
-
-        if (pdDocument != null) {
-            pdDocument.close();
-        }
-        System.runFinalization();
-        System.gc();
-
-        MemoryStats.printMemoryStats();
-
-        var newPDDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupTempFileOnly());
-        newPDDocument.setAllSecurityToBeRemoved(true);
-
-        return newPDDocument;
-    }
-
-
    private void increaseDocumentStatistics(Page page, Document document) {

        if (!page.isLandscape()) {
@@ -1,16 +1,31 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

-import com.iqser.red.service.redaction.v1.server.classification.model.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
+import com.iqser.red.service.redaction.v1.server.classification.model.Header;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
 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.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;

-import java.util.*;
-import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
 public class SectionsBuilderService {

@@ -53,8 +68,7 @@ public class SectionsBuilderService {
                    continue;
                }

-                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification()
-                        .startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                    chunkBlock.setHeadline(lastHeadline);
                    if (document.isHeadlines()) {
@@ -100,17 +114,19 @@ public class SectionsBuilderService {

    public void addImagesToSections(Document document) {

-        Map<Integer, SortedSet<Paragraph>> paragraphMap = new HashMap<>();
+        Map<Integer, List<Paragraph>> paragraphMap = new HashMap<>();
        for (Paragraph paragraph : document.getParagraphs()) {
            for (AbstractTextContainer container : paragraph.getPageBlocks()) {
-                paragraphMap.computeIfAbsent(container.getPage(), x -> new TreeSet<>()).add(paragraph);
+
+                paragraphMap.computeIfAbsent(container.getPage(), c -> new ArrayList<>()).add(paragraph);
+
            }
        }

        if (paragraphMap.isEmpty()) {
            Paragraph paragraph = new Paragraph();
            document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
        }

        // first page is always a paragraph, else we can't process pages 1..N,
@@ -118,12 +134,12 @@ public class SectionsBuilderService {
        if (paragraphMap.get(1) == null) {
            Paragraph paragraph = new Paragraph();
            document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
        }

        for (Page page : document.getPages()) {
            for (PdfImage image : page.getImages()) {
-                SortedSet<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
+                List<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
                if (paragraphsOnPage == null) {
                    int i = page.getPageNumber();
                    while (paragraphsOnPage == null) {
@@ -131,27 +147,63 @@ public class SectionsBuilderService {
                        i--;
                    }
                }
-
-                Float perviousEnd = 0f;
                for (Paragraph paragraph : paragraphsOnPage) {
-                    Float currentEnd = 0f;
+                    Float xMin = null;
+                    Float yMin = null;
+                    Float xMax = null;
+                    Float yMax = null;
+
                    for (AbstractTextContainer abs : paragraph.getPageBlocks()) {
                        if (abs.getPage() != page.getPageNumber()) {
                            continue;
                        }
-                        if (abs.getMaxY() > currentEnd) {
-                            currentEnd = abs.getMaxY();
+
+                        if (abs.getMinX() < abs.getMaxX()) {
+                            if (xMin == null || abs.getMinX() < xMin) {
+                                xMin = abs.getMinX();
+                            }
+                            if (xMax == null || abs.getMaxX() > xMax) {
+                                xMax = abs.getMaxX();
+                            }
+                        } else {
+                            if (xMin == null || abs.getMaxX() < xMin) {
+                                xMin = abs.getMaxX();
+                            }
+                            if (xMax == null || abs.getMinX() > xMax) {
+                                xMax = abs.getMinX();
+                            }
                        }
+
+                        if (abs.getMinY() < abs.getMaxY()) {
+                            if (yMin == null || abs.getMinY() < yMin) {
+                                yMin = abs.getMinY();
+                            }
+                            if (yMax == null || abs.getMaxY() > yMax) {
+                                yMax = abs.getMaxY();
+                            }
+                        } else {
+                            if (yMin == null || abs.getMaxY() < yMin) {
+                                yMin = abs.getMaxY();
+                            }
+                            if (yMax == null || abs.getMinY() > yMax) {
+                                yMax = abs.getMinY();
+                            }
+                        }
+
                    }

-                    if (image.getPosition().getY() >= perviousEnd && image.getPosition().getY() <= currentEnd) {
+                    log.debug("Image position x: {}, y: {}", image.getPosition().getX(), image.getPosition().getY());
+                    log.debug("Paragraph position xMin: {}, xMax: {}, yMin: {}, yMax: {}", xMin, xMax, yMin, yMax);
+
+                    if (xMin != null && xMax != null && yMin != null && yMax != null && image.getPosition().getX() >= xMin && image.getPosition()
+                            .getX() <= xMax && image.getPosition().getY() >= yMin && image.getPosition().getY() <= yMax) {
                        paragraph.getImages().add(image);
                        image.setAppendedToParagraph(true);
                    }
-                    perviousEnd = currentEnd;
                }
                if (!image.isAppendedToParagraph()) {
-                    paragraphsOnPage.first().getImages().add(image);
+                    log.debug("Image uses first paragraph");
+                    paragraphsOnPage.get(0).getImages().add(image);
                    image.setAppendedToParagraph(true);
                }
            }
@@ -166,9 +218,7 @@ public class SectionsBuilderService {
            List<Cell> previousTableNonHeaderRow = getRowWithNonHeaderCells(previousTable);
            List<Cell> tableNonHeaderRow = getRowWithNonHeaderCells(currentTable);
            // Allow merging of tables if header row is separated from first logical non-header row
-            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows()
-                    .get(0)
-                    .size() == tableNonHeaderRow.size()) {
+            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows().get(0).size() == tableNonHeaderRow.size()) {
                previousTableNonHeaderRow = previousTable.getRows().get(0).stream().map(cell -> {
                    Cell fakeCell = new Cell(cell.getPoints()[0], cell.getPoints()[2]);
                    fakeCell.setHeaderCells(Collections.singletonList(cell));
@@ -178,8 +228,7 @@ public class SectionsBuilderService {
            if (previousTableNonHeaderRow.size() == tableNonHeaderRow.size()) {
                for (int i = currentTable.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
                    List<Cell> row = currentTable.getRows().get(i);
-                    if (row.size() == tableNonHeaderRow.size() && row.stream()
-                            .allMatch(cell -> cell.getHeaderCells().isEmpty())) {
+                    if (row.size() == tableNonHeaderRow.size() && row.stream().allMatch(cell -> cell.getHeaderCells().isEmpty())) {
                        for (int j = 0; j < row.size(); j++) {
                            row.get(j).setHeaderCells(previousTableNonHeaderRow.get(j).getHeaderCells());
                        }
@@ -229,24 +278,20 @@ public class SectionsBuilderService {
            TextBlock wordBlock = (TextBlock) container;

            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
            } else if (splitByTable) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
                alreadyAdded = false;
            } else if (pageBefore != -1 && wordBlock.getPage() != pageBefore) {
                textBlock.setPage(pageBefore);
                paragraph.getPageBlocks().add(textBlock);
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
            } else {
                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
-                        .getHeight());
+                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
            }
            pageBefore = wordBlock.getPage();
            splitByTable = false;
@@ -268,11 +313,7 @@ public class SectionsBuilderService {

    private boolean hasInvalidHeaderInformation(Table table) {

-        return table.getRows()
-                .stream()
-                .flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
-                .findAny()
-                .isEmpty();
+        return table.getRows().stream().flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells()))).findAny().isEmpty();

    }

@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.settings;

-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+import lombok.Data;
+
@Data
@ConfigurationProperties("redaction-service")
 public class RedactionServiceSettings {
@@ -17,6 +18,8 @@ public class RedactionServiceSettings {

    private int analysisVersion = 1;

-    private boolean enableEntityRecognition = true;
+    private boolean nerServiceEnabled = true;
+
+    private boolean priorityMode;

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

-import java.io.IOException;
-import java.io.InputStream;
-
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.stereotype.Service;
-
+import com.dslplatform.json.DslJson;
+import com.dslplatform.json.runtime.Settings;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
@@ -15,21 +12,24 @@ import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
-
+import io.micrometer.core.annotation.Timed;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.InputStream;

@Slf4j
@Service
@RequiredArgsConstructor
 public class RedactionStorageService {

-    private final ObjectMapper objectMapper;
    private final StorageService storageService;

-
    @SneakyThrows
    public InputStream getStoredObject(String storageId) {

@@ -38,75 +38,74 @@ public class RedactionStorageService {


    @SneakyThrows
-    public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
+    public void storeObject(String dossierId, String fileId, FileType fileType, InputStream inputStream) {

-        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), inputStream);
    }


+    @SneakyThrows
+    @Timed("redactmanager_storeObject")
+    public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
+        storageService.storeJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), any);
+    }
+
+    @Timed("redactmanager_getImportedRedactions")
+    public ImportedRedactions getImportedRedactions(String dossierId, String fileId) {
+
+        try {
+            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMPORTED_REDACTIONS), ImportedRedactions.class);
+        } catch (StorageObjectDoesNotExist e) {
+            log.debug("Imported redactions not available.");
+            return null;
+        }
+    }
+
+
+    @Timed("redactmanager_getRedactionLog")
    public RedactionLog getRedactionLog(String dossierId, String fileId) {

-        InputStreamResource inputStreamResource;
        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG));
+            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG),RedactionLog.class);
        } catch (StorageObjectDoesNotExist e) {
            log.debug("Text not available.");
            return null;
        }

-        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert RedactionLog", e);
-        }
    }


+    @Timed("redactmanager_getText")
    public Text getText(String dossierId, String fileId) {

-        InputStreamResource inputStreamResource;
        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT));
+            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT),Text.class);
        } catch (StorageObjectDoesNotExist e) {
            log.debug("Text not available.");
            return null;
        }
-
-        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), Text.class);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert Text", e);
-        }
    }


+    @Timed("redactmanager_getNerEntities")
    public NerEntities getNerEntities(String dossierId, String fileId) {

-        InputStreamResource inputStreamResource;
        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES));
+            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES), NerEntities.class);
        } catch (StorageObjectDoesNotExist e) {
-            log.debug("NER Entities not available.");
-            return null;
-        }
-
-        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert NerEntities", e);
+            throw new NotFoundException("NER Entities are not available.");
        }
    }


+
+    @Timed("redactmanager_getSectionGrid")
    public SectionGrid getSectionGrid(String dossierId, String fileId) {

        try {
-            var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
-            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
+            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID),SectionGrid.class);
        } catch (StorageObjectDoesNotExist e) {
            throw new NotFoundException("Section Grid is not available.");
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert RedactionLog", e);
        }
    }

@@ -127,8 +126,6 @@ public class RedactionStorageService {
            return dossierId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
        }

-
-
    }

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

+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,11 +33,13 @@ public abstract class AbstractTextContainer {
    }

    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getHeight() {
        return maxY - minY;
    }
-    
+
    @JsonIgnore
+    @JsonAttribute(ignore = true)
    public float getWidth() {
        return maxX - minX;
    }
@@ -9,6 +9,8 @@ server:
  port: 8080

 spring:
+  main:
+    allow-circular-references: true # FIXME
  profiles:
    active: kubernetes
  rabbitmq:
@@ -0,0 +1,115 @@
+package com.iqser.red.service.redaction.v1.server;
+
+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.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.when;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(RedactionIntegrationTest.RedactionIntegrationTestConfiguration.class)
+public class DictionaryServiceTest {
+
+    @MockBean
+    protected KieContainer kieContainer;
+
+    @MockBean
+    protected DictionaryClient dictionaryClient;
+
+    @Autowired
+    protected DictionaryService dictionaryService;
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
+    public static class RedactionIntegrationTestConfiguration {
+
+        @Bean
+        @Primary
+        public StorageService inmemoryStorage() {
+
+            return new FileSystemBackedStorageService();
+        }
+
+    }
+
+    @Test
+    public void testDictionaryServiceConsistency() {
+
+        when(dictionaryClient.getVersion(anyString())).thenReturn(0L);
+        when(dictionaryClient.getColors(anyString())).thenReturn(new Colors("dossierTemplateId", "#cccccc",
+                "#cccccc", "#cccccc", "#cccccc", "#cccccc", "#cccccc","#cccccc",
+                "#cccccc", "#cccccc", "#cccccc", "#cccccc"));
+
+        var type1 = new Type();
+        type1.setType("type1");
+        type1.setId("type1");
+        type1.setVersion(1L);
+        type1.setHexColor("#cccccc");
+        type1.setHasDictionary(true);
+        type1.setEntries(Stream.of("a", "b", "c").map(t -> new DictionaryEntry(1, t, 1L, false, "type1")).collect(Collectors.toList()));
+
+
+        var type2 = new Type();
+        type2.setType("type2");
+        type2.setId("type2");
+        type2.setVersion(1L);
+        type2.setHexColor("#cccccc");
+        type2.setHasDictionary(true);
+        type2.setEntries(Stream.of("d", "e", "f").map(t -> new DictionaryEntry(1, t, 1L, false, "type2")).collect(Collectors.toList()));
+
+
+        var type1Updated = new Type();
+        type1Updated.setType("type1");
+        type1Updated.setId("type1");
+        type1Updated.setVersion(2L);
+        type1Updated.setHexColor("#cccccc");
+        type1Updated.setHasDictionary(true);
+        type1Updated.setEntries(Stream.of("z", "q", "x").map(t -> new DictionaryEntry(1, t, 2L, false, "type1")).collect(Collectors.toList()));
+
+
+        when(dictionaryClient.getAllTypesForDossierTemplate(anyString(), anyBoolean())).thenReturn(List.of(type1, type2));
+        when(dictionaryClient.getDictionaryForType("type1", null)).thenReturn(type1);
+        when(dictionaryClient.getDictionaryForType("type2", null)).thenReturn(type2);
+        when(dictionaryClient.getDictionaryForType("type1", 0L)).thenReturn(type1);
+        when(dictionaryClient.getDictionaryForType("type2", 0L)).thenReturn(type2);
+
+        dictionaryService.updateDictionary("dossierTemplateId", null);
+        var increments = dictionaryService.getDictionaryIncrements("dossierTemplateId",
+                DictionaryVersion.builder().dossierTemplateVersion(0L).build(), null);
+
+
+        when(dictionaryClient.getVersion(any())).thenReturn(1L);
+        when(dictionaryClient.getAllTypesForDossierTemplate(anyString(), anyBoolean())).thenReturn(List.of(type1Updated));
+        when(dictionaryClient.getDictionaryForType("type1", 1L)).thenReturn(type1Updated);
+
+        dictionaryService.updateDictionary("dossierTemplateId", null);
+        var updatedIncrements = dictionaryService.getDictionaryIncrements("dossierTemplateId",
+                DictionaryVersion.builder().dossierTemplateVersion(0L).build(), null);
+
+    }
+}
@@ -1,7 +1,9 @@
 package com.iqser.red.service.redaction.v1.server;

+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
-import com.iqser.red.storage.commons.service.S3StorageService;
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
@@ -10,15 +12,18 @@ import org.springframework.core.io.InputStreamResource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

-public class FileSystemBackedStorageService extends S3StorageService {
+public class FileSystemBackedStorageService implements StorageService {

    private final Map<String, File> dataMap = new HashMap<>();

    public FileSystemBackedStorageService() {
-        super(null, null);
    }

    @SneakyThrows
@@ -33,16 +38,69 @@ public class FileSystemBackedStorageService extends S3StorageService {

    }

-    @SneakyThrows
    @Override
-    public void storeObject(String objectId, byte[] data) {
+    public void deleteObject(String objectId) {
+        dataMap.remove(objectId);
+    }
+
+    @Override
+    public boolean objectExists(String objectId) {
+        return dataMap.containsKey(objectId);
+    }
+
+    @Override
+    public void init() {
+
+    }
+
+    @Override
+    @SneakyThrows
+    public <T> void storeJSONObject(String objectId, T any) {
+        File tempFile = File.createTempFile("test", ".tmp");
+        getMapper().writeValue(new FileOutputStream(tempFile), any);
+        dataMap.put(objectId, tempFile);
+    }
+
+    private ObjectMapper getMapper() {
+        var objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.findAndRegisterModules();
+        return objectMapper;
+    }
+
+    @Override
+    @SneakyThrows
+    public <T> T readJSONObject(String objectId, Class<T> clazz) {
+        if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) {
+            throw new StorageObjectDoesNotExist("Stored object not found");
+        }
+        return getMapper().readValue(new FileInputStream(dataMap.get(objectId)), clazz);
+    }
+
+    public List<String> listPaths() {
+        return new ArrayList<>(dataMap.keySet());
+    }
+
+
+    public List<String> listFilePaths() {
+        return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList());
+    }
+
+
+    @Override
+    @SneakyThrows
+    public void storeObject(String objectId, InputStream stream) {
        File tempFile = File.createTempFile("test", ".tmp");

-        IOUtils.write(data, new FileOutputStream(tempFile));
+        try (var fileOutputStream = new FileOutputStream(tempFile)) {
+            IOUtils.copy(stream, fileOutputStream);
+        }

        dataMap.put(objectId, tempFile);
    }

+
    public void clearStorage() {
        this.dataMap.forEach((k, v) -> {
            v.delete();
--- a/Show More
+++ b/Show More