RED-4009: Fixed NPE if comments are null in RedactionLogMergeService

Pull request #387 : RED-3800 switched jackson for dsl-json for internal non-rest related operations
Merge in RED/redaction-service from RED-3800-dsljson to master * commit '7967453c676094efdc438eea1cca2b9e00856c0d': RED-3800 api cleanup RED-3800 api cleanup RED-3800 switched jackson for dsl-json for internal non-rest related operations
2022-05-10 13:20:57 +02:00 · 2022-05-09 21:14:04 +02:00 · 2022-05-09 22:10:53 +03:00 · 2022-05-09 22:03:33 +03:00 · 2022-05-09 22:00:01 +03:00 · 2022-05-09 14:47:03 +02:00
114 changed files with 43091 additions and 1419 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>

@@ -17,6 +17,7 @@ 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.api.builders.Variable;
 import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask;
 import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
@@ -83,6 +84,7 @@ public class PlanSpec {
                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"))
@@ -94,6 +96,7 @@ public class PlanSpec {
                                                        "rm -rf ./*"),
                                        new VcsCheckoutTask()
                                                .description("Checkout Default Repository")
+                                                .cleanCheckout(true)
                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Build")
@@ -115,7 +118,7 @@ public class PlanSpec {
                                                .defaultRepository())
                                .dockerConfiguration(
                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
+                                                .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")
                                )
@@ -147,6 +150,7 @@ public class PlanSpec {
                                                        "rm -rf ./*"),
                                        new VcsCheckoutTask()
                                                .description("Checkout Default Repository")
+                                                .cleanCheckout(true)
                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                        new ScriptTask()
                                                .description("Sonar")
@@ -155,9 +159,9 @@ public class PlanSpec {
                                                .argument(SERVICE_NAME))
                                .dockerConfiguration(
                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
+                                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
                                                .dockerRunArguments("--net=host")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
                                )
                        )
@@ -165,8 +169,7 @@ public class PlanSpec {
                .linkedRepositories("RED / " + SERVICE_NAME)
                .triggers(
                        new ScheduledTrigger()
-                                .scheduleOnceDaily(LocalTime.of(12, 00)),
-                        new BitbucketServerTrigger())
+                                .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
@@ -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>
@@ -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,24 @@

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


    <dependencyManagement>
-
        <dependencies>
+            <dependency>
+                <groupId>com.dslplatform</groupId>
+                <artifactId>dsl-json-java8</artifactId>
+                <version>${dsljson.version}</version>
+            </dependency>
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.11.0</version>
+                <version>1.13.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
-
            <dependency>
                <groupId>org.apache.pdfbox</groupId>
                <artifactId>pdfbox</artifactId>
@@ -47,9 +51,7 @@
                <artifactId>pdfbox-tools</artifactId>
                <version>${pdfbox.version}</version>
            </dependency>
-
        </dependencies>
-
    </dependencyManagement>

    <build>
@@ -58,12 +60,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 +88,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.39.0</persistence-service.version>
+        <persistence-service.version>1.166.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,18 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
@Data
@Builder
@NoArgsConstructor
@@ -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
@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;

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

+import java.util.ArrayList;
+import java.util.List;
+
@Data
@Builder
@NoArgsConstructor
@@ -1,14 +1,14 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
@Data
@Builder
@NoArgsConstructor
@@ -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;
    }
@@ -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.*;
@@ -27,6 +26,7 @@ public class RedactionLogEntry {
    private boolean redacted;
    private boolean isHint;
    private boolean isRecommendation;
+    private boolean isFalsePositive;

    private String section;
    private float[] color;
@@ -40,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;
@@ -53,6 +53,8 @@ public class RedactionLogEntry {

    private boolean excluded;

+    private String sourceId;
+
    @EqualsAndHashCode.Exclude
    @Builder.Default
    private List<Change> changes = new ArrayList<>();
@@ -65,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,11 +12,12 @@
    <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>
@@ -24,6 +25,25 @@
            <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>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 +69,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 +117,18 @@

    <build>
        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
+
            <plugin>
                <!-- generate git.properties for exposure in /info -->
                <groupId>pl.project13.maven</groupId>
@@ -1,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();
@@ -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,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<>();

 }
@@ -1,42 +1,29 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-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;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-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.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.*;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.stream.Collectors;

@Slf4j
@RestController
@@ -45,42 +32,11 @@ 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) {

@@ -169,36 +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);
    }


@@ -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();
-    }
-}
@@ -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) {
@@ -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,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import com.dslplatform.json.CompiledJson;
+import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,6 +11,7 @@ import org.springframework.beans.BeanUtils;

@Data
@NoArgsConstructor
+@CompiledJson
 public class RedTextPosition {

    private String textMatrix;
@@ -26,14 +29,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;


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

+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.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.text.TextPosition;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

-import org.apache.pdfbox.text.TextPosition;
-
-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.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
@Slf4j
@Data
+@CompiledJson
@NoArgsConstructor
@JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {
@@ -27,7 +28,6 @@ public class TextPositionSequence implements CharSequence {
    private float x1;
    private float x2;

-
    public TextPositionSequence(int page) {

        this.page = page;
@@ -112,6 +112,7 @@ public class TextPositionSequence implements CharSequence {


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

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


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

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


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

        return textPositions.get(0).getY();
@@ -142,6 +145,7 @@ public class TextPositionSequence implements CharSequence {


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

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


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

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


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

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


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

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


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

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


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

        return getX2() - getX1();
@@ -192,6 +201,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 +209,7 @@ public class TextPositionSequence implements CharSequence {


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

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


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

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


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

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


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

        return textPositions.get(0).getRotation();
@@ -238,9 +252,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, toString(), textPositions.get(0).getRotation(), textPositions.get(0).getDir());

        float height = getTextHeight();

@@ -291,6 +306,14 @@ public class TextPositionSequence implements CharSequence {
            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 {
            posXEnd = textPositions.get(textPositions.size() - 1)
                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
@@ -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,12 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.queue;

-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;
-
-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;
@@ -15,9 +8,13 @@ import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+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;

@Slf4j
@Service
@@ -30,39 +27,43 @@ public class RedactionMessageReceiver {
    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 REANALYSE:
+                    result = analyzeService.reanalyze(analyzeRequest);
+                    log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;

-            case STRUCTURE_ANALYSE:
-                result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-                log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
+                case STRUCTURE_ANALYSE:
+                    result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+                    log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    break;

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

-            case SURROUNDING_TEXT:
-                result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
-                log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
+                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;
+            }
+
+            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;
+    }
+
+
 }
@@ -48,11 +48,13 @@ public class Entity implements ReasonHolder {

    private Set<Entity> references = new HashSet<>();

+    private EntityType entityType;
+

    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 +73,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 +89,7 @@ public class Entity implements ReasonHolder {
        this.isDictionaryEntry = isDictionaryEntry;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
        this.engines.add(engine);
+        this.entityType = entityType;
    }


@@ -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,20 @@
 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;
    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,15 @@
 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.Data;
 import lombok.NoArgsConstructor;

@Data
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class RedRectangle2D {
@@ -19,6 +22,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,35 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;

 import com.iqser.red.service.redaction.v1.model.ArgumentType;
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.model.FileAttribute;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 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.Patterns;
-
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;

@Data
@Slf4j
@@ -70,11 +62,13 @@ public class Section {
    private List<FileAttribute> fileAttributes = new ArrayList<>();


-    public void addAiEntities(String type, String asType) {
+    @SuppressWarnings("unused")
+    @WhenCondition
+    public void addAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {

        Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
-        Set<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toSet());
-        Set<Entity> found = EntitySearchUtils.find(searchText, values, asType, headline, sectionNumber, false, false, Engine.NER, true);
+        List<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toList());
+        Set<Entity> found = EntitySearchUtils.findEntities(searchText, new SearchImplementation(values, dictionary.isCaseInsensitiveDictionary(asType)), dictionary.getType(asType), new FindEntityDetails(asType, headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
        EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);

        Set<Entity> finalResult = new HashSet<>();
@@ -99,8 +93,11 @@ public class Section {
        nerEntities.removeAll(entitiesOfType);
    }

-
-    public void combineAiTypes(String startType, String combineTypes, int maxDistanceBetween, String asType, int minPartMatches, boolean allowDuplicateTypes) {
+    @SuppressWarnings("unused")
+    @WhenCondition
+    public void combineAiTypes(@Argument(ArgumentType.TYPE) String startType, @Argument(ArgumentType.TYPE) String combineTypes,
+                               @Argument(ArgumentType.INTEGER) int maxDistanceBetween, @Argument(ArgumentType.TYPE) String asType,
+                               @Argument(ArgumentType.INTEGER) int minPartMatches, @Argument(ArgumentType.BOOLEAN) boolean allowDuplicateTypes) {

        Set<String> combineSet = Set.of(combineTypes.split(","));

@@ -119,7 +116,7 @@ public class Section {
            } else if (!allowDuplicateTypes && foundParts.contains(entity.getType())) {
                if (numberOfMatchParts >= minPartMatches) {
                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
                }
                start = -1;
                lastEnd = -1;
@@ -134,7 +131,7 @@ public class Section {
            } else if (entity.getType().equals(startType) && start != -1) {
                if (numberOfMatchParts >= minPartMatches) {
                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
                }
                start = entity.getStart();
                lastEnd = entity.getEnd();
@@ -151,7 +148,7 @@ public class Section {

        if (numberOfMatchParts >= minPartMatches) {
            String value = searchText.substring(start, lastEnd);
-            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER, true));
        }

        if (!found.isEmpty()) {
@@ -161,35 +158,35 @@ public class Section {
        }
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {

@@ -197,14 +194,14 @@ public class Section {
                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {

@@ -212,35 +209,46 @@ public class Section {
        return tabularData != null && tabularData.containsKey(cleanHeaderName);
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean aiMatchesType(@Argument(ArgumentType.TYPE) String type) {

        return nerEntities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {

        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {

        return images.stream().anyMatch(image -> !image.isIgnored() && image.getType().equals(type));
    }

-
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {

        return StringUtils.containsIgnoreCase(headline, word);
    }

+    @SuppressWarnings("unused")
+    @WhenCondition
+    public boolean containsRegEx(@Argument(ArgumentType.STRING) String regEx, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive) {

+        var compiledPattern = Patterns.getCompiledPattern(regEx, patternCaseInsensitive);
+
+        var matcher = compiledPattern.matcher(text);
+
+        return matcher.find();
+    }
+
+    @SuppressWarnings("unused")
    @WhenCondition
    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName, @Argument(ArgumentType.STRING) String value) {

@@ -249,49 +257,54 @@ public class Section {
        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).toString().equals(value);
    }

-
+    @SuppressWarnings("unused")
    @ThenAction
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String prefixPattern,
+                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {

-        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
+        expandByPrefixRegEx(type, prefixPattern, patternCaseInsensitive, group, null);
    }


    @ThenAction
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
-                              @Argument(ArgumentType.REGEX) String valuePattern) {
+    @SuppressWarnings("unused")
+    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String prefixPattern,
+                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+                                    @Argument(ArgumentType.REGEX) String valuePattern) {

-        Pattern compiledValuePattern = null;
+        if (StringUtils.isEmpty(prefixPattern)) return;

-        if (valuePattern != null) {
-            compiledValuePattern = Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        }
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
+        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
+        var compiledPrefixPattern = Patterns.getCompiledPattern(prefixPattern, patternCaseInsensitive);

        Set<Entity> expanded = new HashSet<>();
-        for (Entity entity : entities) {
+        for (var entity : entities) {
+            System.out.println(entity.getWord());

-            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+            if (!entity.getType().equals(type) || entity.getTextBefore() == null) {
                continue;
            }

            if (valuePattern != null) {
-                Matcher valueMatcher = compiledValuePattern.matcher(entity.getWord());
+                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
                if (!valueMatcher.matches()) {
                    continue;
                }
            }

-            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+            var matcher = compiledPrefixPattern.matcher(entity.getTextBefore());

            while (matcher.find()) {
-                String match = matcher.group(group);
+                var match = matcher.group(group);

                if (StringUtils.isNotBlank(match)) {
-                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE);
+
+                    if (!StringUtils.endsWith(entity.getTextBefore(), match)) {
+                        log.warn("Rules contain invalid group for expandByPrefixRegEx command; prefixPattern:{}, group{}", prefixPattern, group);
+                        continue;
+                    }
+
+                    var expandedEntities = findEntities(match + entity.getWord(), type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE, false);
                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
                }
            }
@@ -303,6 +316,64 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+
+        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
+    }
+
+
+    @ThenAction
+    @SuppressWarnings("unused")
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+                              @Argument(ArgumentType.REGEX) String valuePattern) {
+
+        if (StringUtils.isEmpty(suffixPattern)) return;
+
+        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
+        var compiledSuffixPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
+
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {
+
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            if (valuePattern != null) {
+                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
+                if (!valueMatcher.matches()) {
+                    continue;
+                }
+            }
+
+            var matcher = compiledSuffixPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                var match = matcher.group(group);
+
+                if (StringUtils.isNotBlank(match)) {
+
+                    if (!StringUtils.startsWith(entity.getTextAfter(), match)) {
+                        log.warn("Rules contain invalid group for expandByRegEx command; suffixPattern:{}, group{}", suffixPattern, group);
+                        continue;
+                    }
+
+                    var expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE, false);
+                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+    }
+
+
+    @ThenAction
+    @SuppressWarnings("unused")
    public void redactImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

@@ -311,6 +382,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {

        redactImage(type, ruleNumber, reason, null, false);
@@ -318,6 +390,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

@@ -326,6 +399,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {

        redact(type, ruleNumber, reason, null, false);
@@ -333,6 +407,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason,
                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -342,6 +417,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason) {

@@ -351,6 +427,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -360,6 +437,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                                 @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                 @Argument(ArgumentType.STRING) String reason) {
@@ -369,6 +447,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -378,6 +457,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                 @Argument(ArgumentType.STRING) String reason) {
@@ -387,6 +467,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -396,6 +477,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                      @Argument(ArgumentType.STRING) String reason) {
@@ -405,6 +487,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason,
                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -414,6 +497,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason) {

@@ -422,6 +506,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                                          @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                          @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
@@ -431,6 +516,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                                             @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
@@ -440,6 +526,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {

@@ -450,22 +537,22 @@ public class Section {
        while (matcher.find()) {
            String match = matcher.group(group);
            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
            }
        }
    }


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {

-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());

        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
+            if (entity.getType().equals(type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -476,6 +563,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix, @Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

@@ -491,24 +579,33 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                             @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

-        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE);
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }

+    @ThenAction
+    @SuppressWarnings("unused")
+    public void ignore(@Argument(ArgumentType.TYPE) String type) {

-    public void ignore(String type) {
+        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.ENTITY));
+    }

-        entities.removeIf(entity -> entity.getType().equals(type));
+    @ThenAction
+    @SuppressWarnings("unused")
+    public void ignoreRecommendations(@Argument(ArgumentType.TYPE) String type) {
+
+        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.RECOMMENDATION));
    }


    @ThenAction
-    public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.STRING) String pattern,
-                                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
-                                              @Argument(ArgumentType.TYPE) String asType) {
+    @SuppressWarnings("unused")
+    public void expandToFalsePositiveByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.STRING) String pattern,
+                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -524,17 +621,19 @@ public class Section {
            while (matcher.find()) {
                String match = matcher.group(group);
                if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null, Engine.RULE));
+                    expanded.addAll(findEntities(entity.getWord() + match, type, false, false, 0, null, null, Engine.RULE, false));
                }
            }
        }

        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        expanded.forEach(e -> e.setEntityType(EntityType.FALSE_POSITIVE));
    }


    @ThenAction
+    @SuppressWarnings("unused")
    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {

@@ -545,7 +644,7 @@ public class Section {
        while (matcher.find()) {
            String match = matcher.group(group);
            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE);
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE, false);
                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
            }
        }
@@ -553,14 +652,16 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType) {

-        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE);
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE, false);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }


    @ThenAction
+    @SuppressWarnings("unused")
    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");
@@ -577,7 +678,7 @@ public class Section {
                }

                if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(cleanValue);
+                    localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(cleanValue);
                }
            }
        }
@@ -585,6 +686,7 @@ public class Section {


    @ThenAction
+    @SuppressWarnings("unused")
    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type) {

        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
@@ -599,21 +701,19 @@ public class Section {
        while (matcher.find()) {
            String match = matcher.group(group);
            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
            }
        }
    }


-    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine) {
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine, boolean asRecommendation) {

        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
-        String searchValue = caseInsensitive ? value.toLowerCase() : value;
-
-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, engine, false);
-
+        Set<Entity> found = EntitySearchUtils.findEntities(text, new SearchImplementation(value, caseInsensitive), dictionary.getType(asType),
+                new FindEntityDetails(asType, headline, sectionNumber, false, false, engine, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY));
        found.forEach(entity -> {
            if (redacted) {
                entity.setRedaction(true);
@@ -629,10 +729,8 @@ public class Section {

    private void redact(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {

-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
+            if (entity.getType().equals(type)) {
                entity.setRedaction(redaction);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -665,7 +763,7 @@ public class Section {
        } else {
            String word = value.toString();

-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE, EntityType.ENTITY);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
@@ -692,9 +790,9 @@ public class Section {
                while (matcher.find()) {
                    String match = matcher.group().trim();
                    if (match.length() >= 3) {
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(match);
+                        localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(match);
                        String lastname = match.split(" ")[0];
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(lastname);
+                        localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(lastname);
                    }
                }
            }
@@ -709,7 +807,7 @@ public class Section {
        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                    if (redactEverywhere && !isLocal()) {
@@ -730,7 +828,7 @@ public class Section {
        while (matcher.find()) {
            String match = matcher.group(group);
            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
            }
        }
@@ -745,7 +843,7 @@ public class Section {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {

-                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                    if (redactEverywhere && !isLocal()) {
@@ -772,7 +870,7 @@ public class Section {
                            return;
                        }

-                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);

                        if (redactEverywhere && !isLocal()) {
@@ -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,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 ImageMetadata {

    private Classification classification;
@@ -1,15 +1,24 @@
 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<>();

 }
@@ -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,33 +1,13 @@
 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.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.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.dossiertemplate.dossier.file.FileType;
-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.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+import com.iqser.red.service.redaction.v1.model.*;
 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.Text;
@@ -35,21 +15,25 @@ 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.DictionaryIncrement;
-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.model.*;
 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 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;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;

@Slf4j
@Service
@@ -92,6 +76,7 @@ public class AnalyzeService {
        }

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

        Text text = new Text(pageCount, sectionTexts);
@@ -131,10 +116,14 @@ public class AnalyzeService {
            return analyze(analyzeRequest);
        }

+//        var dis = System.currentTimeMillis();
        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
+//        log.info("Dictionary Increment time time: {} ms", (System.currentTimeMillis() - dis));

+//        var fis = System.currentTimeMillis();
        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse()
                .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
+//        log.info("Find sections time: {} ms", (System.currentTimeMillis() - fis));

        if (sectionsToReanalyse.isEmpty()) {
            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
@@ -144,7 +133,7 @@ public class AnalyzeService {
        if (redactionServiceSettings.isNerServiceEnabled()) {
            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
        } else {
-            nerEntities = NerEntities.builder().build();
+            nerEntities = new NerEntities();
        }

        List<SectionText> reanalysisSections = text.getSectionTexts()
@@ -152,20 +141,31 @@ public class AnalyzeService {
                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
                .collect(Collectors.toList());

+//        long kis = System.currentTimeMillis();
        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+//        log.info("Kie time: {} ms", (System.currentTimeMillis() - kis));

+//        long dds = System.currentTimeMillis();
        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+//        log.info("Dict Time time: {} ms", (System.currentTimeMillis() - dds));

+//        long pis = System.currentTimeMillis();
        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
+//        log.info("Find Entities time: {}", (System.currentTimeMillis() - pis));
+
+//        long crs = System.currentTimeMillis();
        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
-
+//        log.info("Create Redaction-log time: {} ms", (System.currentTimeMillis() - crs));
+//        long prs = System.currentTimeMillis();
        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false);
-
+//        log.info("Process imports time: {} ms", (System.currentTimeMillis() - prs));
        redactionLog.getRedactionLogEntry()
                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()) && !entry.getType()
                        .equals(IMPORTED_REDACTION_TYPE));
        redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);

+//        var fls = System.currentTimeMillis();
+        //        log.info("Finalize time: {} ms", (System.currentTimeMillis() - fls));
        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
    }

@@ -179,7 +179,7 @@ public class AnalyzeService {
        if (redactionServiceSettings.isNerServiceEnabled()) {
            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
        } else {
-            nerEntities = NerEntities.builder().build();
+            nerEntities = new NerEntities();
        }
        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
@@ -191,7 +191,7 @@ public class AnalyzeService {
        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()
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(), redactionLogEntries, convert(legalBasis), dictionary.getVersion()
                .getDossierTemplateVersion(), dictionary.getVersion()
                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));

@@ -219,13 +219,19 @@ public class AnalyzeService {
            }
        }

+//        long ss = System.currentTimeMillis();
+
+        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());
            }

        }
+//        log.info("Section Find time: {}", (System.currentTimeMillis() - ss));

        log.info("Should reanalyze {} sections for request: {}, took: {}", sectionsToReanalyse.size(), analyzeRequest, System.currentTimeMillis() - start);

@@ -282,6 +288,9 @@ public class AnalyzeService {
                .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) {

@@ -5,7 +5,6 @@ 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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,13 +35,13 @@ public class DictionaryService {
        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();
@@ -61,6 +60,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 +80,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,18 +97,61 @@ 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))
+                        .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());

@@ -118,20 +180,24 @@ public class DictionaryService {
    }


-    private Set<DictionaryEntry> convertEntries(String typeId) {
+    private DictionaryEntries getEntries(String typeId, Long fromVersion) {

-        var type = dictionaryClient.getDictionaryForType(typeId);
+        var type = dictionaryClient.getDictionaryForType(typeId, fromVersion);

-        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;
+        return new DictionaryEntries(entries, falsePositives, falseRecommendations);
    }


+
    private float[] convertColor(String hex) {

        Color color = Color.decode(hex);
@@ -139,16 +205,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);
@@ -169,16 +225,6 @@ 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;
-    }
-
-
    public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {

        List<DictionaryModel> copy = new ArrayList<>();
@@ -202,21 +248,17 @@ public class DictionaryService {
    }


-    public float[] getRequestRemoveColor(String dossierTemplateId) {
-
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
-    }
-
-
    public float[] getNotRedactedColor(String dossierTemplateId) {

        return dictionariesByDossierTemplate.get(dossierTemplateId).getNotRedactedColor();
    }


-    public float[] getRequestAddColor(String dossierTemplateId) {
-
-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {
+        if (dictionaryRepresentation == null) {
+            return null;
+        } else {
+            return dictionaryRepresentation.getDictionaryVersion();
+        }
    }
-
 }
@@ -1,18 +1,5 @@
 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.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
@@ -21,21 +8,20 @@ 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.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.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.model.*;
 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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+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
@@ -61,6 +47,8 @@ public class EntityRedactionService {
        }

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

@@ -83,6 +71,7 @@ public class EntityRedactionService {
                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary);
            }

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

                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
@@ -121,6 +110,7 @@ public class EntityRedactionService {
                }));
            }

+
            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(false)
                    .dictionaryTypes(dictionary.getTypes())
@@ -139,6 +129,7 @@ public class EntityRedactionService {
                    .images(reanalysisSection.getImages())
                    .fileAttributes(analyzeRequest.getFileAttributes())
                    .build(), reanalysisSection.getSearchableText()));
+
        }

        Set<Entity> entities = new HashSet<>();
@@ -175,7 +166,7 @@ public class EntityRedactionService {
                                .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()));
+                                .getReferences(), entity.getEntityType()));
            }
        }
        return entitiesPerPage;
@@ -197,26 +188,18 @@ 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().get(key).forEach(value -> {

-                    if (dictionary.getLocalAccessMap().get(key) == null) {
-                        log.warn("Dictionary {} is null", key);
-                    }
+                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);
-                    }
+                if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                    log.warn("Dictionary {} localEntries is null", key);
+                }

-                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                });
-            }
+                dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+            });
        });
    }

@@ -226,20 +209,20 @@ public class EntityRedactionService {
                                  List<Integer> cellStarts) {

        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<>();
@@ -256,10 +239,10 @@ public class EntityRedactionService {

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

-        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getResult().containsKey(sectionNumber)) {
-            nerEntities.getResult().get(sectionNumber).forEach(res -> {
+        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));
+                    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) {
@@ -269,7 +252,7 @@ public class EntityRedactionService {
                        }
                    }
                    if (!intersectsCellStart) {
-                        entities.add(new Entity(res.getValue(), 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,6 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

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

 import org.springframework.stereotype.Service;
@@ -24,14 +24,15 @@ public class ImportedRedactionService {


    public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId, String dossierId, String fileId,
-                                          List<RedactionLogEntry> redactionLogEntries, boolean addImportedRedactions) {
+                                                             List<RedactionLogEntry> redactionLogEntries,
+                                                             boolean addImportedRedactions) {

        var importedRedactions = redactionStorageService.getImportedRedactions(dossierId, fileId);
        if (importedRedactions == null) {
            return redactionLogEntries;
        }

-        redactionLogEntries.removeIf(redactionLogEntry -> hasIntersections(redactionLogEntry, importedRedactions));
+        redactionLogEntries.forEach(redactionLogEntry -> addIntersections(redactionLogEntry, importedRedactions));

        if (addImportedRedactions) {
            return addImportedRedactionsRedactionLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
@@ -42,8 +43,8 @@ public class ImportedRedactionService {


    private List<RedactionLogEntry> addImportedRedactionsRedactionLogEntries(String dossierTemplateId,
-                                                          List<RedactionLogEntry> redactionLogEntries,
-                                                          ImportedRedactions importedRedactions) {
+                                                                             List<RedactionLogEntry> redactionLogEntries,
+                                                                             ImportedRedactions importedRedactions) {

        for (List<ImportedRedaction> importedRedactionsValues : importedRedactions.getImportedRedactions().values()) {
            for (ImportedRedaction importedRedaction : importedRedactionsValues) {
@@ -53,7 +54,7 @@ public class ImportedRedactionService {
                        .imported(true)
                        .redacted(true)
                        .positions(importedRedaction.getPositions())
-                        .color(getColor("imported_redaction", dossierTemplateId))
+                        .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
                        .build();

                redactionLogEntries.add(redactionLogEntry);
@@ -64,7 +65,7 @@ public class ImportedRedactionService {
    }


-    private boolean hasIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
+    private void addIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {

        for (Rectangle rectangle : redactionLogEntry.getPositions()) {
            if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
@@ -72,13 +73,15 @@ public class ImportedRedactionService {
                for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
                        if (intersects(importedRedactionPosition, rectangle)) {
-                            return true;
+                            if(redactionLogEntry.getImportedRedactionIntersections() == null){
+                                redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
+                            }
+                            redactionLogEntry.getImportedRedactionIntersections().add(importedRedaction.getId());
                        }
                    }
                }
            }
        }
-        return false;
    }


@@ -1,12 +1,5 @@
 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;
@@ -19,11 +12,19 @@ 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 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
@@ -87,10 +88,10 @@ public class ManualRedactionSurroundingTextService {
    }


-    private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
-                                                     List<Rectangle> toFindPositions) {
+    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> 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);

        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
@@ -17,6 +17,7 @@ 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;
@@ -203,7 +204,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())
@@ -233,10 +235,4 @@ public class RedactionLogCreatorService {
        return dictionaryService.isHint(type, dossierTemplateId);
    }

-
-    private boolean isRecommendation(String type, String dossierTemplateId) {
-
-        return dictionaryService.isRecommendation(type, dossierTemplateId);
-    }
-
 }
@@ -4,14 +4,23 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Annota
 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.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.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+import java.awt.*;
 import java.time.OffsetDateTime;
+import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;

@@ -20,19 +29,55 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
 public class RedactionLogMergeService {

-    private final DictionaryService dictionaryService;

    private final SectionTextService sectionTextService;

+    private final RedactionStorageService redactionStorageService;

-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                              String dossierTemplateId, ManualRedactions manualRedactions,
-                                              Set<Integer> excludedPages) {
+    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 +87,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 +108,12 @@ 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 +166,7 @@ public class RedactionLogMergeService {


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

        manualRedactionWrappers.forEach(mrw -> {

@@ -124,7 +179,7 @@ public class RedactionLogMergeService {
                    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,7 +189,7 @@ 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);
@@ -153,11 +208,11 @@ public class RedactionLogMergeService {
                    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);
@@ -171,7 +226,7 @@ public class RedactionLogMergeService {
            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,12 +234,12 @@ 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());
                }

@@ -211,7 +266,7 @@ 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);
@@ -232,7 +287,7 @@ 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());
@@ -240,7 +295,7 @@ public class RedactionLogMergeService {
                    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());
@@ -271,16 +326,16 @@ 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());

@@ -293,6 +348,11 @@ public class RedactionLogMergeService {
        return redactionLogEntries;
    }

+    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,16 +363,15 @@ public class RedactionLogMergeService {
    }


-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
-
-        return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) &&
-                manualRedactionEntry.getProcessedDate() != null &&
-                (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+    @SuppressWarnings("PMD.UselessParentheses")
+    private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) {
+        return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary())
+                || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDictionary()) && manualRedactionEntry.getProcessedDate() == null);
    }


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

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

@@ -323,12 +382,13 @@ public class RedactionLogMergeService {

        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)
@@ -340,33 +400,66 @@ public class RedactionLogMergeService {
    }


-    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.getRequestRemove());
        }
-        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        if (skipped || !isRedaction && !isHint(types, type)) {
+            return convertColor(colors.getNotRedacted());
        }
-        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.getRequestAdd());
        } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+            return convertColor(colors.getNotRedacted());
        }
-        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("#9398a0"));
+    }
+
+
+    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);
@@ -31,7 +31,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!");
@@ -47,7 +47,7 @@ public class SurroundingWordsService {
        }

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

            if (cellstarts != null) {
                for (int i = 0; i < cellstarts.size(); i++) {
@@ -1,90 +1,57 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

-import java.util.ArrayList;
-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.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.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
-
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
@Slf4j
@UtilityClass
@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()));
+        }
    }


@@ -98,13 +65,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 {
@@ -121,6 +85,22 @@ public class EntitySearchUtils {
    }


+    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,16 +108,44 @@ 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()) {
-                    // FIXME this is workaround for RED-3327 and should be removed in the future.
-                    if(word.getType().contains("recommendation_") && !inner.getType().contains("recommendation_")) {
+                    if (word.getEntityType().equals(EntityType.RECOMMENDATION) && inner.getEntityType().equals(EntityType.ENTITY)) {
                        wordsToRemove.add(word);
-                    } else {
+                    } else if(!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
+                            inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
                        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);
+
+            }
+        }
    }


@@ -151,13 +159,20 @@ 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());
+                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);
@@ -175,22 +190,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();
    }


@@ -210,11 +220,32 @@ 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());
+            } 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,10 +31,12 @@ 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()));
@@ -1,5 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
+import com.iqser.red.service.redaction.v1.server.classification.service.ClassificationService;
+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;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -13,38 +35,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.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;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
-import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
@Slf4j
@Service
@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 +55,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 +72,12 @@ public class PdfSegmentationService {
                Document document = new Document();
                List<Page> pages = new ArrayList<>();

-                pdDocument = reinitializePDDocument(tempFile, null);
+                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(1024 * 1024 * 64));
+                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 +98,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 +126,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 +143,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()) {
@@ -20,4 +20,6 @@ public class RedactionServiceSettings {

    private boolean nerServiceEnabled = true;

+    private boolean priorityMode;
+
 }
@@ -1,12 +1,7 @@
 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.fasterxml.jackson.databind.ObjectMapper;
+import com.dslplatform.json.DslJson;
+import com.dslplatform.json.runtime.Settings;
 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;
@@ -16,20 +11,26 @@ 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 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.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;

@Slf4j
@Service
@RequiredArgsConstructor
 public class RedactionStorageService {

-    private final ObjectMapper objectMapper;
    private final StorageService storageService;

+    private final DslJson<Object> dslJson = new DslJson<>(Settings.basicSetup());
+

    @SneakyThrows
    public InputStream getStoredObject(String storageId) {
@@ -40,8 +41,15 @@ public class RedactionStorageService {

    @SneakyThrows
    public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
+        var baos = new ByteArrayOutputStream();
+        dslJson.serialize(any, baos);
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), baos.toByteArray());
+    }

-        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
+    @SneakyThrows
+    public void storeObject(String dossierId, String fileId, FileType fileType, InputStream inputStream) {
+
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), inputStream);
    }


@@ -56,7 +64,7 @@ public class RedactionStorageService {
        }

        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), ImportedRedactions.class);
+            return dslJson.deserialize(ImportedRedactions.class, inputStreamResource.getInputStream());
        } catch (IOException e) {
            throw new RuntimeException("Could not imported redactions", e);
        }
@@ -74,7 +82,7 @@ public class RedactionStorageService {
        }

        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
+            return dslJson.deserialize(RedactionLog.class, inputStreamResource.getInputStream());
        } catch (IOException e) {
            throw new RuntimeException("Could not convert RedactionLog", e);
        }
@@ -92,7 +100,7 @@ public class RedactionStorageService {
        }

        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), Text.class);
+            return dslJson.deserialize(Text.class, inputStreamResource.getInputStream());
        } catch (IOException e) {
            throw new RuntimeException("Could not convert Text", e);
        }
@@ -109,7 +117,7 @@ public class RedactionStorageService {
        }

        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
+            return dslJson.deserialize(NerEntities.class, inputStreamResource.getInputStream());
        } catch (IOException e) {
            throw new RuntimeException("Could not convert NER Entities", e);
        }
@@ -120,7 +128,7 @@ public class RedactionStorageService {

        try {
            var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
-            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
+            return dslJson.deserialize(SectionGrid.class, sectionGrid.getInputStream());
        } catch (StorageObjectDoesNotExist e) {
            throw new NotFoundException("Section Grid is not available.");
        } catch (IOException e) {
@@ -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"));
+
+        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);
+
+    }
+}
@@ -10,15 +10,15 @@ import org.springframework.core.io.InputStreamResource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.InputStream;
+import java.util.*;
+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 +33,51 @@ public class FileSystemBackedStorageService extends S3StorageService {

    }

+    @Override
+    public void deleteObject(String objectId) {
+        dataMap.remove(objectId);
+    }
+
+    @Override
+    public boolean objectExists(String objectId) {
+        return dataMap.containsKey(objectId);
+    }
+
+    @Override
+    public void init() {
+
+    }
+
+    public List<String> listPaths(){
+        return new ArrayList<>(dataMap.keySet());
+    }
+
+
+    public List<String> listFilePaths(){
+        return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList());
+    }
+
+
    @SneakyThrows
    @Override
    public void storeObject(String objectId, byte[] data) {
-        File tempFile = File.createTempFile("test", ".tmp");
+        File tempFile = File.createTempFile("storage", objectId.replace("/","-"));

        IOUtils.write(data, new FileOutputStream(tempFile));

        dataMap.put(objectId, tempFile);
    }

+    @Override
+    @SneakyThrows
+    public void storeObject(String objectId, InputStream stream) {
+        File tempFile = File.createTempFile("test", ".tmp");
+
+        IOUtils.copy(stream, new FileOutputStream(tempFile));
+
+        dataMap.put(objectId, tempFile);
+    }
+
    public void clearStorage() {
        this.dataMap.forEach((k, v) -> {
            v.delete();
@@ -1,28 +1,35 @@
 package com.iqser.red.service.redaction.v1.server;

-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.time.OffsetDateTime;
-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.UUID;
-import java.util.stream.Collectors;
-
+import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+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.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.annotate.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.server.annotate.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.server.annotate.AnnotationService;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
+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.utils.OsUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -47,48 +54,15 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.ObjectMapper;
-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.Rectangle;
-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.common.JSONPrimitive;
-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.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.FileAttribute;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
-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.utils.OsUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
+import java.io.*;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;

-import lombok.SneakyThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;

@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -114,17 +88,14 @@ public class RedactionIntegrationTest {
    private static final String OCR = "ocr";
    private static final String DOSSIER_REDACTIONS = "dossier_redactions";
    private static final String IMPORTED_REDACTION = "imported_redaction";
-
-    private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
-    private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
-
-    private static final String FALSE_POSITIVE = "false_positive";
-
    private static final String PII = "PII";

    @Autowired
    private RedactionController redactionController;

+    @Autowired
+    private AnnotationService annotationService;
+
    @Autowired
    private AnalyzeService analyzeService;

@@ -157,6 +128,8 @@ public class RedactionIntegrationTest {

    private final Map<String, List<String>> dictionary = new HashMap<>();
    private final Map<String, List<String>> dossierDictionary = new HashMap<>();
+    private final Map<String, List<String>> falsePositive = new HashMap<>();
+    private final Map<String, List<String>> falseRecommendation = new HashMap<>();
    private final Map<String, String> typeColorMap = new HashMap<>();
    private final Map<String, Boolean> hintTypeMap = new HashMap<>();
    private final Map<String, Boolean> caseInSensitiveMap = new HashMap<>();
@@ -220,10 +193,10 @@ public class RedactionIntegrationTest {
        loadTypeForTest();
        loadNerForTest();
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getTypeResponse());
+        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID, false)).thenReturn(getTypeResponse());

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID)).thenReturn(List.of(Type.builder()
+        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID, false)).thenReturn(List.of(Type.builder()
                .id(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)
                .type(DOSSIER_REDACTIONS)
                .dossierTemplateId(TEST_DOSSIER_ID)
@@ -234,37 +207,41 @@ public class RedactionIntegrationTest {
                .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
                .build()));

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
-        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(PURITY, false));
-        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMAGE, false));
-        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(OCR, false));
-        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(FORMULA, false));
-        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
-        when(dictionaryClient.getDictionaryForType(IMPORTED_REDACTION + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(IMPORTED_REDACTION, true));
+        mockDictionaryCalls(null);
+        mockDictionaryCalls(0L);
+
        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }


+    private void mockDictionaryCalls(Long version){
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PII, false));
+        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMAGE, false));
+        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(OCR, false));
+        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(LOGO, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
+        when(dictionaryClient.getDictionaryForType(IMPORTED_REDACTION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMPORTED_REDACTION, true));
+
+    }
+
    @Test
    public void test270Rotated() {

        AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
-        MemoryStats.printMemoryStats();
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);
        assertThat(result).isNotNull();
@@ -276,7 +253,6 @@ public class RedactionIntegrationTest {
    public void testLargeScannedFileOOM() {

        AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf");
-        MemoryStats.printMemoryStats();
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);
        assertThat(result).isNotNull();
@@ -306,7 +282,7 @@ public class RedactionIntegrationTest {
        dictionary.get(AUTHOR).add("Drinking water");
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(1L);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -330,6 +306,8 @@ public class RedactionIntegrationTest {
    @Test
    public void redactionExpansionOverlap() throws IOException {

+        // F. Lastname, J. Doe, M. Mustermann
+        // Lastname M., Doe J., Mustermann M.
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/ExpansionTest.pdf");
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

@@ -348,6 +326,7 @@ public class RedactionIntegrationTest {


    @Test
+    @Ignore
    @SneakyThrows
    public void testIgnoreHint() {

@@ -512,16 +491,13 @@ public class RedactionIntegrationTest {
        deleted.add("David Chubb");
        deleted.add("mouse");

-        dictionary.get(FALSE_POSITIVE).add("David Chubb");
-        reanlysisVersions.put("David Chubb", 3L);

        reanlysisVersions.put("mouse", 3L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();

@@ -543,7 +519,7 @@ public class RedactionIntegrationTest {
        end = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (end - start));

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -557,7 +533,7 @@ public class RedactionIntegrationTest {

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

        analyzeService.reanalyze(request);

@@ -582,17 +558,18 @@ public class RedactionIntegrationTest {
        dictionary.get(AUTHOR).add("report");
        reanlysisVersions.put("report", 2L);
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(2L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        mockDictionaryCalls(0L);
+
        analyzeService.reanalyze(request);

        dictionary.get(AUTHOR).add("assessment report");
        reanlysisVersions.put("assessment report", 3L);
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        mockDictionaryCalls(2L);
        analyzeService.reanalyze(request);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        mockDictionaryCalls(3L);
        analyzeService.reanalyze(request);

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
@@ -606,7 +583,7 @@ public class RedactionIntegrationTest {

        assertThat(changes.size()).isEqualTo(2);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -676,6 +653,7 @@ public class RedactionIntegrationTest {

        dictionary.get(AUTHOR).add("properties");
        reanlysisVersions.put("properties", 1L);
+        mockDictionaryCalls(0L);

        dictionary.get(AUTHOR).add("physical");
        reanlysisVersions.put("physical", 2L);
@@ -683,16 +661,14 @@ public class RedactionIntegrationTest {
        deleted.add("David Chubb");
        deleted.add("mouse");

-        dictionary.get(FALSE_POSITIVE).add("David Chubb");
        reanlysisVersions.put("David Chubb", 3L);

        reanlysisVersions.put("mouse", 3L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();

@@ -714,7 +690,7 @@ public class RedactionIntegrationTest {
        end = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (end - start));

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -725,10 +701,11 @@ public class RedactionIntegrationTest {

        deleted.remove("mouse");
        reanlysisVersions.put("mouse", 4L);
+        mockDictionaryCalls(3L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(4L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

        analyzeService.reanalyze(request);

@@ -748,7 +725,7 @@ public class RedactionIntegrationTest {
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -838,7 +815,7 @@ public class RedactionIntegrationTest {

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -972,7 +949,7 @@ public class RedactionIntegrationTest {
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -988,6 +965,7 @@ public class RedactionIntegrationTest {


    @Test
+    @Ignore
    public void resizeRedactionTest() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
@@ -1103,7 +1081,7 @@ public class RedactionIntegrationTest {

        analyzeService.reanalyze(request);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
@@ -1127,7 +1105,7 @@ public class RedactionIntegrationTest {
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -1143,6 +1121,7 @@ public class RedactionIntegrationTest {


    @Test
+    @Ignore
    public void testManualSurroundingText() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/new/S4.pdf");
@@ -1203,7 +1182,7 @@ public class RedactionIntegrationTest {
        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
        AnalyzeResult result = analyzeService.analyze(request);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
                .fileId(TEST_FILE_ID)
@@ -1280,21 +1259,6 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(RECOMMENDATION_AUTHOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_author.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(RECOMMENDATION_ADDRESS, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_address.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(FALSE_POSITIVE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/false_positive.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
        dictionary.computeIfAbsent(PURITY, v -> new ArrayList<>())
                .addAll(ResourceLoader.load("dictionaries/purity.txt")
                        .stream()
@@ -1331,6 +1295,13 @@ public class RedactionIntegrationTest {
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
        dossierDictionary.put(IMPORTED_REDACTION, new ArrayList<>());
+
+        falsePositive.computeIfAbsent(PII, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/PII_false_positive.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+
    }


@@ -1384,9 +1355,6 @@ public class RedactionIntegrationTest {
        typeColorMap.put(PUBLISHED_INFORMATION, "#85ebff");
        typeColorMap.put(TEST_METHOD, "#91fae8");
        typeColorMap.put(PII, "#66ccff");
-        typeColorMap.put(RECOMMENDATION_AUTHOR, "#8df06c");
-        typeColorMap.put(RECOMMENDATION_ADDRESS, "#8df06c");
-        typeColorMap.put(FALSE_POSITIVE, "#ffffff");
        typeColorMap.put(PURITY, "#ffe187");
        typeColorMap.put(IMAGE, "#fcc5fb");
        typeColorMap.put(OCR, "#fcc5fb");
@@ -1406,9 +1374,6 @@ public class RedactionIntegrationTest {
        hintTypeMap.put(PUBLISHED_INFORMATION, true);
        hintTypeMap.put(TEST_METHOD, true);
        hintTypeMap.put(PII, false);
-        hintTypeMap.put(RECOMMENDATION_AUTHOR, false);
-        hintTypeMap.put(RECOMMENDATION_ADDRESS, false);
-        hintTypeMap.put(FALSE_POSITIVE, true);
        hintTypeMap.put(PURITY, false);
        hintTypeMap.put(IMAGE, true);
        hintTypeMap.put(OCR, true);
@@ -1429,9 +1394,6 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(PUBLISHED_INFORMATION, true);
        caseInSensitiveMap.put(TEST_METHOD, false);
        caseInSensitiveMap.put(PII, false);
-        caseInSensitiveMap.put(RECOMMENDATION_AUTHOR, false);
-        caseInSensitiveMap.put(RECOMMENDATION_ADDRESS, false);
-        caseInSensitiveMap.put(FALSE_POSITIVE, false);
        caseInSensitiveMap.put(PURITY, false);
        caseInSensitiveMap.put(IMAGE, true);
        caseInSensitiveMap.put(OCR, true);
@@ -1452,9 +1414,6 @@ public class RedactionIntegrationTest {
        recommendationTypeMap.put(PUBLISHED_INFORMATION, false);
        recommendationTypeMap.put(TEST_METHOD, false);
        recommendationTypeMap.put(PII, false);
-        recommendationTypeMap.put(RECOMMENDATION_AUTHOR, true);
-        recommendationTypeMap.put(RECOMMENDATION_ADDRESS, true);
-        recommendationTypeMap.put(FALSE_POSITIVE, false);
        recommendationTypeMap.put(PURITY, false);
        recommendationTypeMap.put(IMAGE, false);
        recommendationTypeMap.put(OCR, false);
@@ -1464,7 +1423,6 @@ public class RedactionIntegrationTest {
        recommendationTypeMap.put(DOSSIER_REDACTIONS, false);
        recommendationTypeMap.put(IMPORTED_REDACTION, false);

-        rankTypeMap.put(FALSE_POSITIVE, 160);
        rankTypeMap.put(PURITY, 155);
        rankTypeMap.put(PII, 150);
        rankTypeMap.put(ADDRESS, 140);
@@ -1477,8 +1435,6 @@ public class RedactionIntegrationTest {
        rankTypeMap.put(PUBLISHED_INFORMATION, 70);
        rankTypeMap.put(TEST_METHOD, 60);
        rankTypeMap.put(HINT_ONLY, 50);
-        rankTypeMap.put(RECOMMENDATION_AUTHOR, 40);
-        rankTypeMap.put(RECOMMENDATION_ADDRESS, 30);
        rankTypeMap.put(IMAGE, 30);
        rankTypeMap.put(OCR, 29);
        rankTypeMap.put(LOGO, 28);
@@ -1528,6 +1484,8 @@ public class RedactionIntegrationTest {
                .id(type + ":" + TEST_DOSSIER_TEMPLATE_ID)
                .hexColor(typeColorMap.get(type))
                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
+                .falsePositiveEntries(falsePositive.containsKey(type) ? toDictionaryEntry(falsePositive.get(type)) : new ArrayList<>())
+                .falseRecommendationEntries(falseRecommendation.containsKey(type) ? toDictionaryEntry(falseRecommendation.get(type)) : new ArrayList<>())
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
                .isRecommendation(recommendationTypeMap.get(type))
@@ -1571,7 +1529,7 @@ public class RedactionIntegrationTest {

        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

-        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
                .dossierId(TEST_DOSSIER_ID)
                .fileId(TEST_FILE_ID)
                .build());
@@ -1581,6 +1539,44 @@ public class RedactionIntegrationTest {
        }
    }

+    @Test
+    public void testExpandByPrefixRegEx() throws IOException {
+
+        assertThat(dictionary.get(AUTHOR).contains("Robinson"));
+        assertThat(! dictionary.get(AUTHOR).contains("Mrs. Robinson"));
+        assertThat(dictionary.get(AUTHOR).contains("Bojangles"));
+        assertThat(! dictionary.get(AUTHOR).contains("Mr. Bojangles"));
+        assertThat(dictionary.get(AUTHOR).contains("Tambourine Man"));
+        assertThat(! dictionary.get(AUTHOR).contains("Mr. Tambourine Man"));
+
+        String fileName = "files/mr-mrs.pdf";
+        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
+
+        ClassPathResource pdfFileResource = new ClassPathResource(fileName);
+        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
+
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        analyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
+        var values = redactionLog.getRedactionLogEntry()
+                .stream()
+                .map(RedactionLogEntry::getValue)
+                .collect(Collectors.toList());
+
+        assertThat(values).contains("Mrs. Robinson");
+        assertThat(values).contains("Mr. Bojangles");
+        assertThat(values).contains("Mr. Tambourine Man");
+    }

    @SneakyThrows
    private AnalyzeRequest prepareStorage(InputStream stream) {
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.model;
+package com.iqser.red.service.redaction.v1.server.annotate;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;

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

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -1,9 +1,15 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
+package com.iqser.red.service.redaction.v1.server.annotate;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import lombok.RequiredArgsConstructor;
+import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -17,6 +23,7 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;

 import java.awt.*;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
 import java.util.*;
@@ -26,8 +33,39 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
 public class AnnotationService {

+    private final RedactionStorageService redactionStorageService;
+    private final DictionaryService dictionaryService;

-    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {
+    private final RedactionLogMergeService redactionLogMergeService;
+
+    public AnnotateResponse annotate(AnnotateRequest annotateRequest) {
+
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var mergedRedactionLog = redactionLogMergeService.provideRedactionLog(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());
+            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);
+        }
+    }
+
+    private void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {

        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = convertRedactionLog(redactionLog);

@@ -86,7 +124,7 @@ public class AnnotationService {
        annotations.add(annotation);

        if (redactionLogEntry.getComments() != null) {
-            for (Comment comment : redactionLogEntry.getComments()) {
+            for (RedactionLogComment comment : redactionLogEntry.getComments()) {
                PDAnnotationText txtAnnot = new PDAnnotationText();
                txtAnnot.setAnnotationName(String.valueOf(comment.getId()));
                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
@@ -0,0 +1,87 @@
+package com.iqser.red.service.redaction.v1.server.realdata;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.MessageType;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.springframework.core.io.ClassPathResource;
+
+import java.time.OffsetDateTime;
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+public class AnalyseFileRealDataIntegrationTest extends LiveDataIntegrationTest {
+
+    public static final String FILE_NAME = "test-file";
+
+    @Test
+    @SneakyThrows
+    public void testFile() {
+
+        ObjectMapper om = new ObjectMapper();
+        om.registerModule(new JavaTimeModule());
+
+        var file = new ClassPathResource(BASE_DIR + "data/" + FILE_NAME + ".pdf").getInputStream();
+        redactionStorageService.storeObject("dossierId", "fileId", FileType.ORIGIN, file);
+
+
+        try {
+            var nerData = new ClassPathResource(BASE_DIR + "data/" + FILE_NAME + ".ner.json").getInputStream();
+            redactionStorageService.storeObject("dossierId", "fileId", FileType.NER_ENTITIES, nerData);
+        } catch (Exception e) {
+            log.warn("No NER File Provided");
+            redactionServiceSettings.setNerServiceEnabled(false);
+        }
+
+
+        AnalyzeRequest ar = AnalyzeRequest.builder()
+                .fileId("fileId")
+                .dossierId("dossierId")
+                .analysisNumber(1)
+                .dossierTemplateId("dossierTemplateId")
+                .lastProcessed(OffsetDateTime.now())
+                .excludedPages(Set.of())
+                .fileAttributes(List.of())
+                .build();
+
+
+        try {
+            var text = new ClassPathResource(BASE_DIR + "data/" + FILE_NAME + ".text.json").getInputStream();
+            var sectionText = new ClassPathResource(BASE_DIR + "data/" + FILE_NAME + ".section-grid.json").getInputStream();
+            redactionStorageService.storeObject("dossierId", "fileId", FileType.TEXT, text);
+            redactionStorageService.storeObject("dossierId", "fileId", FileType.SECTION_GRID, sectionText);
+        } catch (Exception e) {
+            log.info("No text file provided, Performing Structure analysis");
+
+            ar.setMessageType(MessageType.STRUCTURE_ANALYSE);
+            String in = om.writeValueAsString(ar);
+            redactionMessageReceiver.receiveAnalyzeRequest(in, false);
+        }
+
+
+        try {
+            var redactionLog = new ClassPathResource(BASE_DIR + "data/" + FILE_NAME + ".redaction-log.json").getInputStream();
+        } catch (Exception e) {
+            log.info("No redaction log provided, Performing full analysis");
+
+            ar.setMessageType(MessageType.ANALYSE);
+            String in = om.writeValueAsString(ar);
+            redactionMessageReceiver.receiveAnalyzeRequest(in, false);
+        }
+
+
+        simulateIncrement(List.of("Desiree"), "PII", 3L);
+        ar.setMessageType(MessageType.REANALYSE);
+        String in = om.writeValueAsString(ar);
+        redactionMessageReceiver.receiveAnalyzeRequest(in, false);
+
+
+        // var log = redactionStorageService.getRedactionLog("dossierId","fileId");
+    }
+
+}
@@ -0,0 +1,196 @@
+package com.iqser.red.service.redaction.v1.server.realdata;
+
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
+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.Application;
+import com.iqser.red.service.redaction.v1.server.FileSystemBackedStorageService;
+import com.iqser.red.service.redaction.v1.server.client.*;
+import com.iqser.red.service.redaction.v1.server.queue.RedactionMessageReceiver;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.iqser.red.storage.commons.service.StorageService;
+import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+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.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.when;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(LiveDataIntegrationTest.RedactionIntegrationTestConfiguration.class)
+public class LiveDataIntegrationTest {
+
+    protected static String BASE_DIR = "performance/";
+
+    protected static String EFSA_SANITISATION_GFL_V1 = "dictionaries/EFSA_sanitisation_GFL_v1/";
+
+    @MockBean
+    protected DictionaryClient dictionaryClient;
+
+    @MockBean
+    protected EntityRecognitionClient entityRecognitionClient;
+
+    @MockBean
+    private FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+
+    @MockBean
+    private LegalBasisClient legalBasisClient;
+
+    @Autowired
+    private ResourcePatternResolver resourcePatternResolver;
+
+    @MockBean
+    private RulesClient rulesClient;
+
+    @Autowired
+    protected DictionaryService dictionaryService;
+
+    @Autowired
+    protected RedactionStorageService redactionStorageService;
+
+    @Autowired
+    protected RedactionMessageReceiver redactionMessageReceiver;
+
+    @Autowired
+    protected FileSystemBackedStorageService fileSystemBackedStorageService;
+
+    @Autowired
+    protected RedactionServiceSettings redactionServiceSettings;
+
+    private List<Type> types;
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
+    public static class RedactionIntegrationTestConfiguration {
+
+        @Bean
+        @Primary
+        public StorageService inmemoryStorage() {
+
+            return new FileSystemBackedStorageService();
+        }
+
+    }
+
+
+    @SneakyThrows
+    @Before
+    public void prepareTest() {
+
+        when(dictionaryClient.getVersion(anyString())).thenReturn(1L);
+        when(dictionaryClient.getVersionForDossier(anyString())).thenReturn(1L);
+
+        var rules = IOUtils.toString(new ClassPathResource(BASE_DIR + EFSA_SANITISATION_GFL_V1 + "rules.drl").getInputStream());
+        when(rulesClient.getRules(any())).thenReturn(JSONPrimitive.of(rules));
+
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        var jsonNode = objectMapper.readTree(new ClassPathResource(BASE_DIR + EFSA_SANITISATION_GFL_V1 + "types.json").getInputStream());
+        types = objectMapper.treeToValue(jsonNode.get("types"), objectMapper.getTypeFactory().constructType(
+                new TypeReference<List<Type>>() {
+                }));
+
+        types.forEach(t -> {
+            t.setId(t.getType());
+            t.setVersion(0L);
+        });
+
+        when(dictionaryClient.getAllTypesForDossierTemplate(anyString(), anyBoolean())).thenReturn(types);
+        when(dictionaryClient.getAllTypesForDossier(anyString(), anyBoolean())).thenReturn(new ArrayList<>());
+
+
+        when(dictionaryClient.getColors(anyString())).thenReturn(objectMapper.readValue(new ClassPathResource(BASE_DIR + EFSA_SANITISATION_GFL_V1 + "colors.json").getInputStream(), Colors.class));
+
+        when(dictionaryClient.getDictionaryForType(anyString(), nullable(Long.class))).then(answer -> {
+            String typeName = answer.getArgument(0);
+
+            var found = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst();
+            if(found.isPresent()) {
+                var type = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst().get();
+                type.setEntries(getEntries(typeName, type.getTypeId()));
+
+                return type;
+            }else{
+                return null;
+            }
+        });
+
+        dictionaryService.updateDictionary("dossierTemplateId","dossierId");
+    }
+
+    public void simulateIncrement(List<String> values, String deltaTypeName, long version) {
+        when(dictionaryClient.getVersion(anyString())).thenReturn(version);
+        when(dictionaryClient.getVersionForDossier(anyString())).thenReturn(version);
+
+        when(dictionaryClient.getDictionaryForType(anyString(), nullable(Long.class))).then(answer -> {
+            String typeName = answer.getArgument(0);
+
+            var found = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst();
+            if(found.isPresent()) {
+
+                var type = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst().get();
+
+                if (deltaTypeName.equalsIgnoreCase(typeName)) {
+                    type.setEntries(values.stream().map(l -> new DictionaryEntry(0, l, version, false, type.getTypeId())).collect(Collectors.toList()));
+                } else {
+                    type.setEntries(new ArrayList<>());
+                }
+
+                return type;
+            }else{
+                return null;
+            }
+        });
+    }
+
+
+    @Test
+    public void testUpdateDictionary() {
+        dictionaryService.updateDictionary("dossierTemplateId", "dossierId");
+
+        var dict = dictionaryService.getDeepCopyDictionary("dossierTemplateId", "dossierId");
+        assertThat(dict.getLocalAccessMap().size()).isEqualTo(12);
+    }
+
+    @SneakyThrows
+    private List<DictionaryEntry> getEntries(String typeName, String typeId) {
+        Resource[] dictionaryResources = resourcePatternResolver.getResources("classpath:" + BASE_DIR + EFSA_SANITISATION_GFL_V1 + "dictionaries/**");
+        for (var resource : dictionaryResources) {
+            if (resource.getFilename().contains(typeName)) {
+
+                List<String> lines = IOUtils.readLines(resource.getInputStream());
+                return lines.stream().map(l -> new DictionaryEntry(0, l, 0L, false, typeId)).collect(Collectors.toList());
+
+            }
+        }
+        return new ArrayList<>();
+    }
+}
@@ -9,6 +9,7 @@ import org.junit.Test;

 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;

 public class EntitySearchUtilsTest {

@@ -16,8 +17,8 @@ public class EntitySearchUtilsTest {
    public void testNestedEntitiesRemoval() {

        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        entities.add(nested);
        entities.add(nesting);
        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
@@ -39,14 +40,14 @@ public class EntitySearchUtilsTest {

        // Arrange
        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
+        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        existingEntities.add(existingEntity1);
        existingEntities.add(existingEntity2);

        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE);
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        foundEntities.add(foundEntities1);
        foundEntities.add(foundEntities2);

@@ -72,14 +73,14 @@ public class EntitySearchUtilsTest {

        // Arrange
        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
+        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        existingEntities.add(existingEntity1);
        existingEntities.add(existingEntity2);

        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE);
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        foundEntities.add(foundEntities1);
        foundEntities.add(foundEntities2);

@@ -104,14 +105,14 @@ public class EntitySearchUtilsTest {

        // Arrange
        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
+        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE,EntityType.ENTITY);
+        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        existingEntities.add(existingEntity1);
        existingEntities.add(existingEntity2);

        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        foundEntities.add(foundEntities1);
        foundEntities.add(foundEntities2);

@@ -136,22 +137,25 @@ public class EntitySearchUtilsTest {

        // Arrange
        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
+        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        existingEntities.add(existingEntity1);
        existingEntities.add(existingEntity2);

        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
+        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntities3 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        foundEntities.add(foundEntities1);
        foundEntities.add(foundEntities2);
+        foundEntities.add(foundEntities3);

        // Act
        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);

        // Assert
-        assertThat(result.size()).isEqualTo(0);
+        assertThat(result.size()).isEqualTo(1);
+        assertThat(result.contains(foundEntities2));

    }

@@ -166,22 +170,27 @@ public class EntitySearchUtilsTest {

        // Arrange
        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE);
+        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
        existingEntities.add(existingEntity1);
        existingEntities.add(existingEntity2);

        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
+        Entity foundEntitiesOverlap1 = new Entity("Batman X. Superman Y.", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntitiesOverlap2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntitiesSubset1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity foundEntitiesSubset2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        foundEntities.add(foundEntitiesOverlap1);
+        foundEntities.add(foundEntitiesOverlap2);
+        foundEntities.add(foundEntitiesSubset1);
+        foundEntities.add(foundEntitiesSubset2);

        // Act
        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);

        // Assert
-        assertThat(result.size()).isEqualTo(0);
+        assertThat(result.size()).isEqualTo(2);
+        assertThat(result).containsExactlyInAnyOrder(foundEntitiesSubset1, foundEntitiesSubset2);

    }

@@ -94,7 +94,7 @@ public class PdfSegmentationServiceTest {
        ImageServiceResponse imageServiceResponse = objectMapper.readValue(responseJson.getInputStream(), ImageServiceResponse.class);

        Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getImageMetadata().stream().forEach(imageMetadata -> {
+        imageServiceResponse.getData().stream().forEach(imageMetadata -> {
            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()), ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)), imageMetadata.getPosition().getPageNumber()));
        });
@@ -9,6 +9,7 @@ ribbon:
 spring:
  main:
    allow-bean-definition-overriding: true
+    allow-circular-references: true # FIXME

 processing.kafkastreams: false

@@ -8620,4 +8620,6 @@ Doe
 M. Mustermann
 F. Lastname
 Mustermann
-Lastname
+Lastname
+Bojangles
+Tambourine Man
@@ -0,0 +1 @@
+C. J. Alfred Xinyi
@@ -1,239 +0,0 @@
-(Parent
-ADME - Bioanalyses, Vergèze,
-Aeration: Gentle
-Andrews mean
-Andrews pKi
-BASF study code
-Billington –
-Bond elute
-Brown Liquid
-Brown Orange
-Brown Solid
-Brown disco
-Brown discoloured
-Brown fat
-Brown liquid
-Brown solid
-Buehler (1980),
-Buehler (1980).
-Buehler 9
-Buehler Test.
-Buehler assay
-Buehler test
-Buehler)
-Buehler-like :
-Calandra lark
-Cary, NC,
-Chambersas for
-Class 4
-Class III’
-Class III’)
-Class method,
-Class2 (effectively
-ClassMethod) Vischim
-Clay =
-Cochran-Armitage Test.
-Cochran-armitage test.
-Dunnett 2
-Dunnett's "t''
-Dunnett's Test
-Dunnett's multiple
-Dunnett's t-test
-Dunnett's test
-Dunnett) **
-Dunnett) Dose
-Dunnett) Food
-Dunnett) Lower
-Dunnett, 1964)
-Dunnett’s Multiple
-Dunnett’s T
-Dunnett’s Test)
-Dunnett’s adjustment
-Dunnett’s multiple
-Dunnett’s post
-Dunnett’s t-test)
-Fine vacuolation
-Fine white
-Finewhite powder
-Fischer 344
-Fischer 344)
-Fischer F344
-Fischer rat
-Fischer) Contaminants:
-Fischer-344 acceptability
-Fischer-344/
-Fischer-344/DuCrj acceptability
-Fischer344 rats.
-Fischer344) :
-Fischerrat embryo
-Fischer’s exact
-Fisher 344
-Fisher Exact Test
-Fisher Exact test
-Fisher exact test
-Fisher's Exact
-Fisher-344 rat
-Fisher344 (F344/
-Fisher344 rat
-Fisher344 rats
-Fisher344 rats.
-Fisher344 rats/
-Fisher344) group
-Fisher’s exact.
-Freeman-Tukey transform
-Gentle aeration
-Grade 2:
-Grade 3)
-Grade 3:
-Green
-Green Alga
-Green as
-Green-, blue-,
-GreenAlga, Selenastrum
-GreenAlga.. Springborn
-Gross External
-Gross Necropsy
-Gross and
-Gross necropsies
-Gross necropsy
-Gross pathology
-Gross pathology:
-Hall Farm
-Hall Farm)
-HallFarm (396
-Ham's F12
-Ham’s F10
-Hand-held
-HarlanWinkelmann, Borchem,
-Hill International,
-Hill Top
-Hill criteria
-Hill, Bracknell,
-HillTop Chamber,
-Hillmodel was
-Hill’s model
-Japanese White
-Jerneplaque assay
-Kent. Blood
-Klimisch score
-Litchfield and Wilcoxon
-Long term
-Long-Term Toxicity
-Long-term
-Longbw/
-Major Macroscopic findings
-Major biliary
-Major defects
-Major deviations
-Major fetal
-Major metabolic
-Major metabolites
-Major route
-Major treatment-related
-Mallard (Anas
-Mallard with
-Manual-Hand held
-Marsh Frog
-Marsh harrier
-Masonjars (500
-Meier formula)
-Meier survival
-Miles anti-Canine
-Miles anti-dog
-Netherlands, 2011
-Netherlands, published:
-Netherlands. Report
-Penn State
-Porewater:
-Rattray study
-Read across
-Reed Bunting
-Reichert-Jung Cryo
-RifconGmbH. Oxon
-Ritz and
-S.P.-U/
-San Diego,
-Shaw's Farm,
-Sprague
-Strain JapaneseWhite
-Strong morphological
-Weight -
-Weight 2744
-Weight Gain
-Weight On
-Weight Range
-Weight and
-Weight and length
-Weight at
-Weight gain
-Weight loss
-Weight of
-Weight only
-Weight range
-Weight, age
-Weight, feed
-Weight-of-evidence approach
-Weight:
-Weight; Adult
-Weight; Whole
-WeightGain 0-1
-WeightRange:
-Weightat dosing:
-Weightrange 200-250g.
-White (Tif:
-White 10
-White 3
-White Age
-White Powder
-White Strain
-White blood
-White cell
-White crystalline
-White guideline
-White guinea-pigs
-White hygroscopic
-White powder
-White solid
-White stork
-White swan
-White to off-white
-White wagtail
-White, solid
-WhitePowder Lot/
-Whiteguideline :
-Whitehygroscopic solid
-Whitepowder Lot/
-Whitepowder Stability
-Whitesolid Batch
-Whiteswan)
-Whiteto off-white
-Wildlife International specifications
-Wildlife Internationalspecifications Water:
-Williams E
-Williams medium
-Williams' medium
-WilliamsE medium
-Williams’ test
-Wilson's method.
-Wilson. All foetal
-Wilson.All foetal
-Wood pigeons
-York.
-Zeneca dossier);
-Zenecadossier); see
-green algae
-CTL
-No details reported
-Not given
-Not indicated
-Not reported
-Not reported.
-Not stated
-Syngenta
-Syngenta AG
-N/A
-No details reported
-Not available
-Test facility
-TBD
-David Chubb
@@ -9,10 +9,9 @@ global Section section

 //rule "0: Expand CBI Authors with firstname initials"
 //    when
-//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+//        Section(matchesType("CBI_author"))
 //    then
 //        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
-//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
 //    end


@@ -20,22 +19,38 @@ rule "0: Add CBI_author from ai"
    when
        Section(aiMatchesType("CBI_author"))
    then
-        section.addAiEntities("CBI_author", "recommendation_CBI_author");
+        section.addAiEntities("CBI_author", "CBI_author");
    end

 rule "0: Combine ai types CBI_author from ai"
    when
        Section(aiMatchesType("ORG"))
    then
-        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "recommendation_CBI_address", 3, false);
+        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "CBI_address", 3, false);
    end

 rule "0: Expand CBI Authors with firstname initials"
    when
-        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
+        Section(matchesType("CBI_author"))
    then
        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
-        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+    end
+
+rule "0: Expand CBI_author and PII matches with salutation prefix"
+    when
+        Section((matchesType("CBI_author") || matchesType("PII")) && (
+            searchText.contains("Mr")
+            || searchText.contains("Mrs")
+            || searchText.contains("Ms")
+            || searchText.contains("Miss")
+            || searchText.contains("Sir")
+            || searchText.contains("Madam")
+            || searchText.contains("Madame")
+            || searchText.contains("Mme")
+        ))
+    then
+        section.expandByPrefixRegEx("CBI_author", "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*", false, 0);
+        section.expandByPrefixRegEx("PII", "\\b(Mrs?|Ms|Miss|Sir|Madame?|Mme)\\s?\\.?\\s*", false, 0);
    end


@@ -1,7 +1,7 @@
 {
  "dossierId": "f889853e-4bf8-49a9-aae5-c38605c6ef40",
  "fileId": "22ef63e29bb2a27db8497272336f6b32",
-  "imageMetadata": [
+  "data": [
    {
      "classification": {
        "probabilities": {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
deiflaender	d2807e0ff1	RED-4009: Fixed NPE if comments are null in RedactionLogMergeService	2022-05-10 13:20:57 +02:00
Timo Bejan	e49bbfca88	Pull request #387 : RED-3800 switched jackson for dsl-json for internal non-rest related operations Merge in RED/redaction-service from RED-3800-dsljson to master * commit '7967453c676094efdc438eea1cca2b9e00856c0d': RED-3800 api cleanup RED-3800 api cleanup RED-3800 switched jackson for dsl-json for internal non-rest related operations	2022-05-09 21:14:04 +02:00
Timo Bejan	7967453c67	RED-3800 api cleanup	2022-05-09 22:10:53 +03:00
Timo Bejan	a3d002929d	RED-3800 api cleanup	2022-05-09 22:03:33 +03:00
Timo Bejan	8a44d6299c	RED-3800 switched jackson for dsl-json for internal non-rest related operations	2022-05-09 22:00:01 +03:00
Timo Bejan	78de7371a0	Pull request #385 : RED-3946 - quotation-mark fix Merge in RED/redaction-service from RED-3946-qf to master * commit 'df2fcd2e5e48298131ebf7a00bf2ed80a9fc2d96': RED-3946 - quotation-mark fix	2022-05-09 14:47:03 +02:00
Dominique Eiflaender	924f791e4d	Pull request #386 : RED-3959: Do not remove entities on larger false_recommendactions Merge in RED/redaction-service from RED-3959 to master * commit '542bbb294a27bf2eb2832a144d239b820bbc0b5f': RED-3959: Do not remove entities on larger false_recommendactions	2022-05-09 12:34:13 +02:00
deiflaender	542bbb294a	RED-3959: Do not remove entities on larger false_recommendactions	2022-05-09 12:27:36 +02:00
Timo Bejan	df2fcd2e5e	RED-3946 - quotation-mark fix	2022-05-09 12:14:09 +03:00
Timo Bejan	8e819a0d26	Pull request #384 : RED-3992 Merge in RED/redaction-service from RED-3992 to master * commit '01e7115d301d8706962390b76af0769eab67c1fe': RED-3992 - Fixed PMD RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations RED-3800 Exception handling for processed files	2022-05-09 10:05:50 +02:00
Timo Bejan	01e7115d30	RED-3992 - Fixed PMD	2022-05-09 09:02:11 +03:00
Timo Bejan	747323f882	RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations	2022-05-09 08:44:42 +03:00
Timo Bejan	729a7334d9	Merge branch 'release/3.107.x' into test-performance	2022-05-06 10:28:47 +03:00
Timo Bejan	36967cab2c	RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations	2022-05-06 10:28:12 +03:00
Timo Bejan	b820463fff	RED-3800 Exception handling for processed files	2022-05-04 12:09:46 +03:00
Timo Bejan	cfd9d7665b	Pull request #383 : RED-3946 - added alternative quatation marks as separators Merge in RED/redaction-service from RED-3946 to master * commit '23d84980cd1528b1276e28aab81bb5bf0a682256': RED-3946 - added alternative quatation marks as separators	2022-05-03 17:15:12 +02:00
Timo Bejan	23d84980cd	RED-3946 - added alternative quatation marks as separators	2022-05-03 18:12:07 +03:00
Timo Bejan	314f7ebdd9	Pull request #382 : Pdftron api cleanup Merge in RED/redaction-service from pdftron-api-cleanup to master * commit 'f666a0330161daed8d3f59189bbe258327926995': RED-3800 code cleanup RED-3800 code cleanup	2022-05-03 12:26:22 +02:00
Timo Bejan	f666a03301	RED-3800 code cleanup	2022-05-03 13:23:10 +03:00
Timo Bejan	313ec32d30	RED-3800 code cleanup	2022-05-03 13:04:00 +03:00
Timo Bejan	76dca41299	Pull request #381 : RED-3915 - source id Merge in RED/redaction-service from RED-3915 to master * commit 'f21e48e3d75c78e0ce5cf92a614e92e9c721eede': RED-3915 - source id	2022-04-25 15:03:29 +02:00
Timo Bejan	f21e48e3d7	RED-3915 - source id	2022-04-25 15:46:12 +03:00
Dominique Eiflaender	bbd60e4bf4	Pull request #379 : RED-3774: Always prefer entities over recommendactions Merge in RED/redaction-service from RED-3774 to master * commit 'ecf794ff37ae5cdeb8aa63f69d6e5205c6da1271': RED-3774: Always prefer entities over recommendactions	2022-04-20 12:20:01 +02:00
deiflaender	ecf794ff37	RED-3774: Always prefer entities over recommendactions	2022-04-20 12:07:31 +02:00
Dominique Eiflaender	5d8f44d55d	Pull request #378 : RED-3658: Fixed annotation positions for document with rotation = 180 and text direction = 180 Merge in RED/redaction-service from RED-3658 to master * commit '513fbbb38d2b9efff6b58489c518db53961e9464': RED-3658: Fixed annotation positions for document with rotation = 180 and text direction = 180	2022-04-20 10:17:34 +02:00
deiflaender	513fbbb38d	RED-3658: Fixed annotation positions for document with rotation = 180 and text direction = 180	2022-04-20 09:58:26 +02:00
Timo Bejan	6178efb7ef	Pull request #376 : soft delete types RED-3880 Merge in RED/redaction-service from RED-3880 to master * commit '7a9bb45b6dbfde2ef68c4ac19d4a144a272e5571': soft delete types RED-3880 soft delete types RED-3880	2022-04-19 14:01:31 +02:00
Timo Bejan	7a9bb45b6d	soft delete types RED-3880	2022-04-19 14:54:44 +03:00
Timo Bejan	00f2a0cb82	soft delete types RED-3880	2022-04-19 14:32:23 +03:00
Timo Bejan	1eb0485dca	Pull request #375 : RED-3800 java-18 support Merge in RED/redaction-service from JAVA-18-support to master * commit 'be15d38065fc6915f815a586d468235b38362e93': RED-3800 java-18 support	2022-04-14 10:52:02 +02:00
Timo Bejan	be15d38065	RED-3800 java-18 support	2022-04-14 11:44:47 +03:00
deiflaender	f154065824	RED-3877: Fixed missing images after migration	2022-04-14 10:38:30 +02:00
Dominique Eiflaender	d4b0de9184	Pull request #374 : RED-3616: Fixed removing not redaction images that intersects imported redactions Merge in RED/redaction-service from RED-3616-11 to master * commit 'fbd9bc71a80ba7788992c6213fd88ce649e127e2': RED-3616: Fixed removing not redaction images that intersects imported redactions	2022-04-12 11:18:53 +02:00
deiflaender	fbd9bc71a8	RED-3616: Fixed removing not redaction images that intersects imported redactions	2022-04-12 11:09:25 +02:00
Dominique Eiflaender	c963c7ac32	Pull request #373 : RED-3666: Added rule function Section containsRegEx Merge in RED/redaction-service from RED-3666 to master * commit '404fd25be0e8ee20528c1f9491f85d8b695a2433': RED-3666: Added rule function Section containsRegEx	2022-04-11 13:02:02 +02:00
deiflaender	404fd25be0	RED-3666: Added rule function Section containsRegEx	2022-04-11 12:57:57 +02:00
Kresnadi Budisantoso	efd53066c4	Pull request #371 : RED-3761 Fix expandByRegEx and expandByPrefixRegEx Merge in RED/redaction-service from kbudisantoso/RED-3761-fix-filter-expanded to master * commit '5b5d898b933c3ae79fb7cb07a6105b15d2952f8e': RED-3761 Fix expandByRegEx and expandByPrefixRegEx	2022-04-11 12:51:57 +02:00
Kresnadi Budisantoso	5b5d898b93	RED-3761 Fix expandByRegEx and expandByPrefixRegEx Adjusted the overlap test to ignore if the compared entities are subsets of each other (start or end position is equal). The `removeEntitiesContainedInLarger` instruction will remove the subset entity.	2022-04-11 11:54:30 +02:00
Dominique Eiflaender	cf75ac56cc	Pull request #372 : RED-3802: Fixed prefer redactions over recommendations Merge in RED/redaction-service from RED-3802 to master * commit '1a6a1a008f76897f01f10dd40ea0307c2c84175c': RED-3802: Fixed prefer redactions over recommendations	2022-04-11 11:04:55 +02:00
deiflaender	1a6a1a008f	RED-3802: Fixed prefer redactions over recommendations	2022-04-11 11:00:07 +02:00
Ali Oezyetimoglu	e19b4573bb	Pull request #370 : RED-3809: Upgrade to latest spring version Merge in RED/redaction-service from RED-3809-rs1 to master * commit '150ee92c1e63de2145a1a093e6c6fe7820b7256d': RED-3809: Upgrade to latest spring version	2022-04-08 11:40:40 +02:00
aoezyetimoglu	150ee92c1e	RED-3809: Upgrade to latest spring version	2022-04-08 11:19:53 +02:00
Kresnadi Budisantoso	7988a8de66	Pull request #369 : RED-3761 prevent compiledPrefixPattern to be nullable by testing prefixPattern parameter Merge in RED/redaction-service from kbudisantoso/RED-3761-prevent-nullable to master * commit '0014d7725ab3f82d2fba4f0677c3966324504876': RED-3761 prevent compiledPrefixPattern to be nullable by testing prefixPattern parameter	2022-04-06 12:52:24 +02:00
Kresnadi Budisantoso	0014d7725a	RED-3761 prevent compiledPrefixPattern to be nullable by testing prefixPattern parameter	2022-04-06 11:38:20 +02:00
Christoph Schabert	55f608cf99	Pull request #368 : verify version finding Merge in RED/redaction-service from autoRelease to master * commit '52e5c58d6e2a30744b3c9b5220edb102b457c8b0': verify version finding	2022-04-06 11:03:54 +02:00
cschabert	f3ad0749b8	add build version output	2022-04-05 11:15:37 +02:00
Dominique Eiflaender	0f0aee9480	Pull request #367 : RED-3616: Do not remove annotation that intersects with skipped imported redactions Merge in RED/redaction-service from RED-3616 to master * commit '941448492bfe294634a8c3c309f237034245e842': RED-3616: Do not remove annotation that intersects with skipped imported redactions	2022-04-05 10:22:08 +02:00
cschabert	ff22dd1a49	verify version check	2022-04-05 09:26:05 +02:00
cschabert	52e5c58d6e	verify version finding	2022-04-05 09:22:31 +02:00
deiflaender	941448492b	RED-3616: Do not remove annotation that intersects with skipped imported redactions	2022-04-05 08:59:18 +02:00
Christoph Schabert	49d47a0682	Pull request #365 : Change Major Version to 3.x Merge in RED/redaction-service from cschabert/pomxml-1649055501527 to master * commit '9bab1205b711d94888a6b3364a41a89d07d310b6': Change Major Version to 3.x	2022-04-04 09:21:17 +02:00
Christoph Schabert	9bab1205b7	Change Major Version to 3.x	2022-04-04 08:58:35 +02:00
Kresnadi Budisantoso	7963c57552	Pull request #364 : RED-3761 add possibility to expand dictionary match with a prefix regex pattern Merge in RED/redaction-service from kbudisantoso/RED-3761-expandByPrefixRegEx to master * commit '1427087d8fa29a218b8b378f83c345c497a26b77': RED-3761 add possibility to expand dictionary match with a prefix regex pattern	2022-04-01 15:35:45 +02:00
Kresnadi Budisantoso	1427087d8f	RED-3761 add possibility to expand dictionary match with a prefix regex pattern	2022-04-01 14:21:47 +02:00
Christoph Schabert	b83400ffa3	Pull request #362 : automate releases Merge in RED/redaction-service from autoRelease to master * commit 'f05f2b21a46b8a4f15bd933570d5a107351aa7b7': automate releases	2022-04-01 14:12:09 +02:00
cschabert	f05f2b21a4	automate releases	2022-04-01 13:47:26 +02:00
Philipp Schramm	02d9ebc24c	Pull request #360 : RED-3568: Do not ignore textblocks if only rotated pages are in the document Merge in RED/redaction-service from RED-3568 to master * commit 'ae3e4570c15dbc2c46373ce68d55cec760e7da6b': RED-3568: Do not ignore textblocks if only rotated pages are in the document	2022-03-29 14:00:20 +02:00
deiflaender	ae3e4570c1	RED-3568: Do not ignore textblocks if only rotated pages are in the document	2022-03-29 13:54:23 +02:00
Dominique Eiflaender	a975596446	Pull request #359 : RED-3699 master Merge in RED/redaction-service from RED-3699-master to master * commit 'a5b96f148950e28618028daef1e91aecdadc89e3': Fixed unknown type for manual type Fixed bug in getColors RED-3699: Do not call updateDictionary on merge RedactionLog	2022-03-25 09:20:52 +01:00
deiflaender	a5b96f1489	Fixed unknown type for manual type	2022-03-25 09:12:32 +01:00
deiflaender	4814ce3650	Fixed bug in getColors	2022-03-25 09:12:21 +01:00
deiflaender	7fccdb32c5	RED-3699: Do not call updateDictionary on merge RedactionLog	2022-03-25 09:12:00 +01:00
Timo Bejan	1d389b78fd	Pull request #357 : processed date fix Merge in RED/redaction-service from processed-date-fix-3.3.x to master * commit 'b4916b65b661c80f0924c163b8795205b9c8e6c3': processed date fix	2022-03-24 11:52:29 +01:00
Timo Bejan	b4916b65b6	processed date fix	2022-03-24 10:16:49 +02:00
Dominique Eiflaender	e1db383463	Pull request #356 : RED-2836: Fixed calculating dictionary increments with false_positive and false_recommendation Merge in RED/redaction-service from RED-2836-3 to master * commit '4d2a7d454d916e7eee65f7cc155323924c2cb229': RED-2836: Fixed calculating dictionary increments with false_positive and false_recommendation	2022-03-22 10:31:05 +01:00
deiflaender	4d2a7d454d	RED-2836: Fixed calculating dictionary increments with false_positive and false_recommendation	2022-03-22 10:24:26 +01:00
Dominique Eiflaender	3758720683	Pull request #355 : Renamed result field in research services to data Merge in RED/redaction-service from ResearchRename to master * commit '22bb0b44db7a22f8088512570d4b2be6e742a887': Renamed result field in research services to data	2022-03-21 16:02:45 +01:00
deiflaender	22bb0b44db	Renamed result field in research services to data	2022-03-21 15:54:37 +01:00
Dominique Eiflaender	e93f5d147f	Pull request #354 : RED-2836: Enabled false positives per dictionary Merge in RED/redaction-service from RED-2836 to master * commit '88e6ac3d2291ced8bb2229c3e7daeb8d78d6da93': RED-2836: Enabled false positives per dictionary	2022-03-21 12:54:48 +01:00
deiflaender	88e6ac3d22	RED-2836: Enabled false positives per dictionary	2022-03-21 12:47:27 +01:00
Timo Bejan	17b885d901	Pull request #353 : pending add to dict Merge in RED/redaction-service from pending-master-fix to master * commit '50d9f4fec22768310232988ee01f9e9aa3ba9dc8': pending add to dict	2022-03-21 11:49:16 +01:00
Timo Bejan	50d9f4fec2	pending add to dict	2022-03-21 11:19:26 +02:00
Philipp Schramm	1bcf0a3f07	Pull request #351 : RED-3553 If image overlaps entity and the entity will be removed Merge in RED/redaction-service from RED-3553 to master * commit '1f6a9aa14deb7ec65fee03e28758f8e3157dbd5f': RED-3553 If image overlaps entity and the entity will be removed	2022-03-17 14:17:16 +01:00
Philipp Schramm	1f6a9aa14d	RED-3553 If image overlaps entity and the entity will be removed	2022-03-17 14:04:59 +01:00
Dominique Eiflaender	c8cf0078eb	Pull request #352 : PortsFrom3.2.x Merge in RED/redaction-service from portsFrom3.2.x to master * commit 'b13a695c64280a97ece198a18605c0f1b5cf753f': RED-3611: Added priority mode that only listens to priority queue RED-3620: Fixed remove from dictionary	2022-03-17 11:16:03 +01:00
deiflaender	b13a695c64	RED-3611: Added priority mode that only listens to priority queue	2022-03-17 10:50:48 +01:00
deiflaender	32a907f697	RED-3620: Fixed remove from dictionary	2022-03-17 10:49:01 +01:00
Timo Bejan	1d1de6caba	Pull request #350 : Removed processed date filter for add to dictionary entries Merge in RED/redaction-service from RED-3538 to master * commit '7b2295393c1c2dcbcecbb11c64929517cb13a6de': Removed processed date filter for add to dictionary entries	2022-03-16 15:46:13 +01:00
Timo Bejan	7b2295393c	Removed processed date filter for add to dictionary entries	2022-03-16 16:29:30 +02:00
Timo Bejan	d0ba3f51c1	Pull request #347 : From version master Merge in RED/redaction-service from from-version-master to master * commit 'c432c56a05ce58d711286bbbcc636ff1445c652d': Updated Persistence Service Version Release 3.80.x branch creation + incremental entry loading based on version for dictionaries	2022-03-14 16:36:14 +01:00
Timo Bejan	c432c56a05	Updated Persistence Service Version	2022-03-14 17:29:04 +02:00
Timo Bejan	e73da002d5	Release 3.80.x branch creation + incremental entry loading based on version for dictionaries	2022-03-14 17:27:52 +02:00