requested date in manual change

Merge in RED/redaction-service from RED-3611 to release/3.80.x

* commit '19014c683e12944e23c1afccbf133530c6548d90':
  RED-3611: Added priority mode that only listens to priority queue

bamboo-specs/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>8.1.3</version>
+    <version>8.0.3</version>
     <relativePath/>
   </parent>
 

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

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

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

@@ -3,62 +3,49 @@ set -e
 
 SERVICE_NAME=$1
 
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
-then
-    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i minor)"
-    echo "new release on master with version $newVersion"
-elif [[ "$bamboo_planRepository_branchName" == release* ]]
-then
-    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i patch)"
-    echo "new release on $bamboo_planRepository_branchName with version $newVersion"
-elif [[ "${bamboo_version_tag}" != "dev" ]]
-then
-    newVersion="${bamboo_version_tag}"
-    echo "new special version bild with $newVersion"
-else
-    mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+if [[ "${bamboo_version_tag}" = "dev" ]]
+then 
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
         --no-transfer-progress \
-        ${bamboo_maven_add_param} \
         clean install \
         -Djava.security.egd=file:/dev/./urandomelse
-    echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-    exit 0
+else        
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        versions:set \
+        -DnewVersion=${bamboo_version_tag}
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        --no-transfer-progress \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
+        versions:set  \
+        -DnewVersion=${bamboo_version_tag}
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+        --no-transfer-progress \
+        clean deploy \
+        -e \
+        -DdeployAtEnd=true \
+        -Dmaven.wagon.http.ssl.insecure=true \
+        -Dmaven.wagon.http.ssl.allowall=true \
+        -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
+        -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
 fi
 
-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 \
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
     --no-transfer-progress \
-    clean deploy \
-    ${bamboo_maven_add_param} \
-    -e \
-    -DdeployAtEnd=true \
-    -Dmaven.wagon.http.ssl.insecure=true \
-    -Dmaven.wagon.http.ssl.allowall=true \
-    -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
-    -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
-
-mvn --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
     package
 
-mvn --no-transfer-progress \
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
     docker:push
+
+if [[ "${bamboo_version_tag}" = "dev" ]]
+then 
+    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
+else
+    echo "gitTag=${bamboo_version_tag}" > git.tag
+fi

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

@@ -3,42 +3,46 @@ set -e
 
 SERVICE_NAME=$1
 
-echo "build jar binaries"
-mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
     --no-transfer-progress \
     clean install \
     -Djava.security.egd=file:/dev/./urandomelse
 
 echo "dependency-check:aggregate"
-mvn --no-transfer-progress \
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
     org.owasp:dependency-check-maven:aggregate
 
 if [[ -z "${bamboo_repository_pr_key}" ]]
 then
     echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    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
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+            --no-transfer-progress \
+            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+            sonar:sonar \
+            -Dsonar.projectKey=RED_$SERVICE_NAME \
+            -Dsonar.host.url=https://sonarqube.iqser.com \
+            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+            -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
+            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+            
 else
     echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi
+    ${bamboo_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

pom.xml

@@ -7,7 +7,7 @@
 
     <artifactId>redaction-service</artifactId>
     <groupId>com.iqser.red.service</groupId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
 
     <packaging>pom</packaging>
@@ -18,4 +18,4 @@
         <module>redaction-service-image-v1</module>
     </modules>
 
-</project>
+</project>

redaction-service-image-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.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>

redaction-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.10.0</version>
+        <version>1.6.0</version>
         <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -23,24 +23,20 @@
 
     <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.13.0</version>
+                <version>1.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
@@ -51,7 +47,9 @@
                 <artifactId>pdfbox-tools</artifactId>
                 <version>${pdfbox.version}</version>
             </dependency>
+
         </dependencies>
+
     </dependencyManagement>
 
     <build>
@@ -60,10 +58,12 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
-                    </plugin>
+                    <version>3.9.0.2155</version>
+                    </plugin>                    
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
+                    <version>6.3.1</version>
                     <configuration>
                         <format>ALL</format>
                     </configuration>
@@ -88,5 +88,27 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 </project>

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

@@ -12,50 +12,19 @@
     <artifactId>redaction-service-api-v1</artifactId>
 
     <properties>
-        <persistence-service.version>1.166.0</persistence-service.version>
+        <persistence-service.version>1.70.2</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>

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

@@ -1,17 +1,18 @@
 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

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

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

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

@@ -1,10 +1,6 @@
-package com.iqser.red.service.redaction.v1.server.annotate;
-
-import java.util.List;
+package com.iqser.red.service.redaction.v1.model;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -21,6 +17,4 @@ public class AnnotateRequest {
     private String dossierTemplateId;
     private String fileId;
     private ManualRedactions manualRedactions;
-    private Colors colors;
-    private List<Type> types;
 }

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

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

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

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

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

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

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

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

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

@@ -22,7 +22,11 @@ public class ManualChange {
     private OffsetDateTime processedDate;
     private OffsetDateTime requestedDate;
     private String userId;
-    private Map<String, String> propertyChanges = new HashMap<>();
+    private Map<String, Object> propertyChanges = new HashMap<>();
+
+    public boolean isProcessed() {
+        return processedDate != null;
+    }
 
     public static ManualChange from(BaseAnnotation baseAnnotation) {
         ManualChange manualChange = new ManualChange();
@@ -33,16 +37,12 @@ public class ManualChange {
         return manualChange;
     }
 
-    public boolean isProcessed() {
-        return processedDate != null;
-    }
-
     public ManualChange withManualRedactionType(ManualRedactionType manualRedactionType) {
         this.manualRedactionType = manualRedactionType;
         return this;
     }
 
-    public ManualChange withChange(String property, String value) {
+    public ManualChange withChange(String property, Object value) {
         this.propertyChanges.put(property, value);
         return this;
     }

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

@@ -1,18 +1,14 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.dslplatform.json.CompiledJson;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
 @Data
-@CompiledJson
 @AllArgsConstructor
-@NoArgsConstructor
 public class RedactionLog {
 
 
@@ -27,8 +23,8 @@ public class RedactionLog {
      */
     private int analysisNumber;
 
-    private List<RedactionLogEntry> redactionLogEntry = new ArrayList<>();
-    private List<RedactionLogLegalBasis> legalBasis = new ArrayList<>();
+    private List<RedactionLogEntry> redactionLogEntry;
+    private List<LegalBasis> legalBasis;
 
     private long dictionaryVersion = -1;
     private long dossierDictionaryVersion = -1;

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

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

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

@@ -1,6 +1,7 @@
 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.*;
@@ -26,7 +27,6 @@ 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<RedactionLogComment> comments = new ArrayList<>();
+    private List<Comment> comments = new ArrayList<>();
 
     private int startOffset;
     private int endOffset;
@@ -53,8 +53,6 @@ public class RedactionLogEntry {
 
     private boolean excluded;
 
-    private String sourceId;
-
     @EqualsAndHashCode.Exclude
     @Builder.Default
     private List<Change> changes = new ArrayList<>();
@@ -67,9 +65,6 @@ 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);
     }

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

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

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

@@ -1,17 +1,15 @@
 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
@@ -24,9 +22,4 @@ public class RedactionRequest {
     private ManualRedactions manualRedactions;
     @Builder.Default
     private Set<Integer> excludedPages = new HashSet<>();
-
-    private Colors colors;
-    private List<Type> types;
-
-    private boolean includeFalsePositives;
 }

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

@@ -3,16 +3,27 @@ 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) {

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

@@ -1,14 +1,13 @@
 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 {
@@ -18,14 +17,13 @@ public class SectionGrid {
     private List<SectionGridSection> sections = new ArrayList<>();
 
     @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
+    @RequiredArgsConstructor
     public static class SectionGridSection {
 
-        private int sectionNumber;
-        private String headline;
-        private Set<Integer> pages;
-        private List<SectionArea> sectionAreas;
+        private final int sectionNumber;
+        private final String headline;
+        private final Set<Integer> pages;
+        private final List<SectionArea> sectionAreas;
 
     }
 }

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

@@ -3,18 +3,30 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
 
 import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@RequiredArgsConstructor
 public class SectionRectangle {
 
+    @NonNull
     private Point topLeft;
+
+    @NonNull
     private float width;
+
+    @NonNull
     private float height;
+
+    @NonNull
     private int part;
+
+    @NonNull
     private int numberOfParts;
 
     private List<CellRectangle> tableCells;

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

@@ -1,16 +1,20 @@
 package com.iqser.red.service.redaction.v1.resources;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.*;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import 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);
 

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

@@ -12,44 +12,18 @@
     <artifactId>redaction-service-server-v1</artifactId>
 
     <properties>
-        <drools.version>7.68.0.Final</drools.version>
-        <kie.version>7.68.0.Final</kie.version>
-        <locationtech.version>1.18.2</locationtech.version>
-        <javaassist.version>3.28.0-GA</javaassist.version>
-        <ahocorasick.version>0.6.3</ahocorasick.version>
-        <jackson.version>2.13.2</jackson.version>
+        <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>
     </properties>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>storage-commons</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-afterburner</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>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>
@@ -75,6 +49,22 @@
             <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>
@@ -123,18 +113,6 @@
 
     <build>
         <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessors>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
-                    </annotationProcessors>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <!-- generate git.properties for exposure in /info -->
                 <groupId>pl.project13.maven</groupId>

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

@@ -9,12 +9,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
-import io.micrometer.core.aop.TimedAspect;
-import io.micrometer.core.instrument.MeterRegistry;
-
 @Import({DefaultWebMvcConfiguration.class})
 @EnableFeignClients(basePackageClasses = RulesClient.class)
 @EnableConfigurationProperties(RedactionServiceSettings.class)
@@ -26,10 +22,5 @@ public class Application {
         SpringApplication.run(Application.class, args);
     }
 
-    @Bean
-    public TimedAspect timedAspect(MeterRegistry registry) {
-        return new TimedAspect(registry);
-    }
-
 
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -15,7 +14,6 @@ public class Footer {
     private List<TextBlock> textBlocks;
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public SearchableText getSearchableText() {
 
         SearchableText searchableText = new SearchableText();

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

@@ -1,6 +1,5 @@
 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;
@@ -15,7 +14,6 @@ public class Header {
     private List<TextBlock> textBlocks;
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public SearchableText getSearchableText() {
 
         SearchableText searchableText = new SearchableText();

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

@@ -1,7 +1,5 @@
 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;
@@ -16,7 +14,6 @@ import java.util.*;
 
 @Data
 @Builder
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class SectionText {
@@ -41,7 +38,6 @@ public class SectionText {
     }
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public SearchableText getSearchableText() {
 
         SearchableText searchableText = new SearchableText();

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

@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
-import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,7 +8,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class Text {

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

@@ -1,7 +1,5 @@
 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;
@@ -17,7 +15,6 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 @Data
-@CompiledJson
 @NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {
 
@@ -124,7 +121,6 @@ public class TextBlock extends AbstractTextContainer {
 
     @Override
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public String getText() {
 
         StringBuilder sb = new StringBuilder();

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

@@ -1,6 +1,5 @@
 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;
@@ -15,7 +14,6 @@ public class UnclassifiedText {
     private List<TextBlock> textBlocks;
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public SearchableText getSearchableText() {
 
         SearchableText searchableText = new SearchableText();

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

@@ -52,7 +52,7 @@ public class ClassificationService {
                               List<Float> headlineFontSizes) {
 
         if (document.getFontSizeCounter().getMostPopular() == null) {
-            textBlock.setClassification("Other");
+            // TODO Figure out why this happens.
             return;
         }
         if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()

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

@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.client.model;
 
-import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -8,7 +7,6 @@ import lombok.NoArgsConstructor;
 
 @Data
 @Builder
-@CompiledJson
 @AllArgsConstructor
 @NoArgsConstructor
 public class EntityRecogintionEntity {

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

@@ -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
-@CompiledJson
-@NoArgsConstructor
+@Builder
 @AllArgsConstructor
+@NoArgsConstructor
 public class NerEntities {
 
-   private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
+   @Builder.Default
+   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
 
 }

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

@@ -1,29 +1,42 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.*;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.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 java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.stream.Collectors;
+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.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.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;
 
 @Slf4j
 @RestController
@@ -32,11 +45,42 @@ 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) {
 
@@ -125,8 +169,36 @@ public class RedactionController implements RedactionResource {
     @Override
     public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
 
+        log.debug("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
 
-        return redactionLogMergeService.provideRedactionLog(redactionRequest);
+        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());
     }
 
 

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

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

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

@@ -1,27 +1,53 @@
 package com.iqser.red.service.redaction.v1.server.parsing;
 
-import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.pdfbox.contentstream.operator.Operator;
-import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.text.TextPosition;
-
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.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;
+
 @Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
 
@@ -40,6 +66,8 @@ 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;
@@ -155,6 +183,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 graphicsPath.clear();
                 break;
 
+//            case OperatorName.DRAW_OBJECT:
+//                processImageOperation(arguments);
+//                break;
 
         }
 
@@ -162,6 +193,32 @@ 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) {
@@ -318,6 +375,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         minCharHeight = Integer.MAX_VALUE;
         maxCharHeight = 0;
         textPositionSequences.clear();
+        images = new ArrayList<>();
         rulings.clear();
         graphicsPath.clear();
         path_x = 0.0f;

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

@@ -1,23 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;
 
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.beans.BeanUtils;
-
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.beans.BeanUtils;
 
 @Data
-@Builder
 @NoArgsConstructor
-@AllArgsConstructor
-@CompiledJson
 public class RedTextPosition {
 
     private String textMatrix;
@@ -35,17 +26,14 @@ 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;
 
 

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

@@ -6,25 +6,18 @@ import java.util.stream.Collectors;
 
 import org.apache.pdfbox.text.TextPosition;
 
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Data
-@Builder
-@CompiledJson
 @NoArgsConstructor
-@AllArgsConstructor
 @JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {
 
@@ -34,6 +27,7 @@ public class TextPositionSequence implements CharSequence {
     private float x1;
     private float x2;
 
+
     public TextPositionSequence(int page) {
 
         this.page = page;
@@ -118,7 +112,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getX1() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -130,7 +123,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getX2() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -143,7 +135,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getRotationAdjustedY() {
 
         return textPositions.get(0).getY();
@@ -151,7 +142,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getRotationAdjustedX() {
 
         return textPositions.get(0).getXDirAdj();
@@ -159,7 +149,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getY1() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -171,7 +160,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getY2() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -183,7 +171,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getTextHeight() {
 
         return textPositions.get(0).getHeightDir() + 2;
@@ -191,7 +178,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getHeight() {
 
         return getY2() - getY1();
@@ -199,7 +185,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getWidth() {
 
         return getX2() - getX1();
@@ -207,7 +192,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public String getFont() {
 
         return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
@@ -215,7 +199,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public String getFontStyle() {
 
         String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
@@ -234,7 +217,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getFontSize() {
 
         return textPositions.get(0).getFontSizeInPt();
@@ -242,7 +224,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getSpaceWidth() {
 
         return textPositions.get(0).getWidthOfSpace();
@@ -250,7 +231,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public int getRotation() {
 
         return textPositions.get(0).getRotation();
@@ -258,10 +238,9 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public Rectangle getRectangle() {
 
-        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, toString(), textPositions.get(0).getRotation(), textPositions.get(0).getDir());
+        log.debug("Page: '{}', Word: '{}', Rotation: '{}'", page, toString(), textPositions.get(0).getRotation());
 
         float height = getTextHeight();
 
@@ -312,14 +291,6 @@ 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;

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

@@ -1,5 +1,12 @@
 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;
@@ -8,13 +15,9 @@ 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
@@ -33,37 +36,31 @@ public class RedactionMessageReceiver {
         log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
         AnalyzeResult result = null;
 
-        try {
-            switch (analyzeRequest.getMessageType()) {
+        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;
-            }
-
-            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());
+            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);
     }
 
 

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

@@ -1,16 +1,22 @@
 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<>();
@@ -20,7 +26,6 @@ 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;
@@ -28,7 +33,6 @@ public class Dictionary {
 
 
     public int getDictionaryRank(String type) {
-
         if (!localAccessMap.containsKey(type)) {
             return 0;
         }
@@ -36,6 +40,16 @@ 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());
@@ -48,9 +62,17 @@ public class Dictionary {
     }
 
 
-    public DictionaryModel getType(String type) {
+    public boolean containsValue(String type, String value) {
 
-        return localAccessMap.get(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);
     }
 
 
@@ -63,7 +85,6 @@ public class Dictionary {
         return false;
     }
 
-
     public boolean isCaseInsensitiveDictionary(String type) {
 
         DictionaryModel dictionaryModel = localAccessMap.get(type);

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

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

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

@@ -2,12 +2,10 @@ 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;
 
@@ -16,76 +14,19 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class DictionaryModel implements Serializable {
 
-    private final String type;
-    private final int rank;
-    private final float[] color;
-    private final boolean caseInsensitive;
-    private final boolean hint;
-    private final boolean isDossierDictionary;
-    private final Set<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);
+    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;
 
+    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;
-    }
-
-
 }

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

@@ -1,23 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity implements ReasonHolder {
 
@@ -54,13 +48,11 @@ 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, EntityType entityType) {
+                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references) {
 
         this.word = word;
         this.type = type;
@@ -79,12 +71,11 @@ 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, EntityType entityType) {
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine) {
 
         this.word = word;
         this.type = type;
@@ -95,7 +86,6 @@ public class Entity implements ReasonHolder {
         this.isDictionaryEntry = isDictionaryEntry;
         this.isDossierDictionaryEntry = isDossierDictionaryEntry;
         this.engines.add(engine);
-        this.entityType = entityType;
     }
 
 

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

@@ -1,18 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
-@Builder
 @RequiredArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode

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

@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-public enum EntityType {
-    ENTITY, RECOMMENDATION, FALSE_POSITIVE, FALSE_RECOMMENDATION
-}

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

@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -8,7 +7,6 @@ import lombok.NoArgsConstructor;
 
 @Data
 @Builder
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class Image implements ReasonHolder {

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

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

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

@@ -1,17 +1,12 @@
 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 com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@Builder
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class RedRectangle2D {
@@ -24,7 +19,6 @@ public class RedRectangle2D {
     private double height;
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public boolean isEmpty() {
         return width <= 0.0f || height <= 0.0f;
     }

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

@@ -1,22 +1,16 @@
 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<>();
 
 
@@ -94,8 +88,8 @@ public class SearchableText {
                         .get(i)
                         .charAt(j, caseInsensitive) == '-') {
 
-                    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)
+                    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)
                             .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)
@@ -111,9 +105,9 @@ public class SearchableText {
                         crossSequenceParts.add(partMatch);
 
                         if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
-                                .length() - 1 || j != searchSpace.get(i).length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i)
+                                .length() - 1 || j != searchSpace.get(i).length() - 1 && isSeparator(searchSpace.get(i)
                                 .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
-                                .length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i + 1)
+                                .length() - 1 && isSeparator(searchSpace.get(i + 1)
                                 .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
                                 .length() - 1 && searchSpace.get(i)
                                 .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
@@ -181,16 +175,16 @@ public class SearchableText {
     }
 
 
-    @Override
-    public String toString() {
-        return buildString(sequences);
+    private boolean isSeparator(char c) {
+
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
     }
 
-    public String asString() {
-        if (stringRepresentation == null) {
-            stringRepresentation = buildString(sequences);
-        }
-        return stringRepresentation;
+
+    @Override
+    public String toString() {
+
+        return buildString(sequences);
     }
 
 

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

@@ -1,5 +1,7 @@
 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;
@@ -21,12 +23,9 @@ 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.model.SectionArea;
 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;
@@ -70,17 +69,12 @@ public class Section {
     @Builder.Default
     private List<FileAttribute> fileAttributes = new ArrayList<>();
 
-    @Builder.Default
-    private List<SectionArea> sectionAreas = new ArrayList<>();
 
-
-    @SuppressWarnings("unused")
-    @WhenCondition
-    public void addAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {
+    public void addAiEntities(String type, String asType) {
 
         Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
-        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));
+        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);
         EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
 
         Set<Entity> finalResult = new HashSet<>();
@@ -105,11 +99,8 @@ public class Section {
         nerEntities.removeAll(entitiesOfType);
     }
 
-    @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) {
+
+    public void combineAiTypes(String startType, String combineTypes, int maxDistanceBetween, String asType, int minPartMatches, boolean allowDuplicateTypes) {
 
         Set<String> combineSet = Set.of(combineTypes.split(","));
 
@@ -128,7 +119,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, true));
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
                 }
                 start = -1;
                 lastEnd = -1;
@@ -143,7 +134,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, true));
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
                 }
                 start = entity.getStart();
                 lastEnd = entity.getEnd();
@@ -160,7 +151,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, true));
+            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
         }
 
         if (!found.isEmpty()) {
@@ -170,35 +161,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) {
 
@@ -206,14 +197,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) {
 
@@ -221,46 +212,35 @@ 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) {
 
@@ -271,64 +251,6 @@ public class Section {
 
 
     @ThenAction
-    @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) {
-
-        expandByPrefixRegEx(type, prefixPattern, patternCaseInsensitive, group, null);
-    }
-
-
-    @ThenAction
-    @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) {
-
-        if (StringUtils.isEmpty(prefixPattern)) return;
-
-        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        var compiledPrefixPattern = Patterns.getCompiledPattern(prefixPattern, patternCaseInsensitive);
-
-        Set<Entity> expanded = new HashSet<>();
-        for (var entity : entities) {
-            System.out.println(entity.getWord());
-
-            if (!entity.getType().equals(type) || entity.getTextBefore() == null) {
-                continue;
-            }
-
-            if (valuePattern != null) {
-                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
-                if (!valueMatcher.matches()) {
-                    continue;
-                }
-            }
-
-            var matcher = compiledPrefixPattern.matcher(entity.getTextBefore());
-
-            while (matcher.find()) {
-                var match = matcher.group(group);
-
-                if (StringUtils.isNotBlank(match)) {
-
-                    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));
-                }
-            }
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-    }
-
-
-    @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) {
 
@@ -337,15 +259,17 @@ 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,
                               @Argument(ArgumentType.REGEX) String valuePattern) {
 
-        if (StringUtils.isEmpty(suffixPattern)) return;
+        Pattern compiledValuePattern = null;
 
-        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
-        var compiledSuffixPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
+        if (valuePattern != null) {
+            compiledValuePattern = Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
+        }
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
 
         Set<Entity> expanded = new HashSet<>();
         for (Entity entity : entities) {
@@ -355,25 +279,19 @@ public class Section {
             }
 
             if (valuePattern != null) {
-                var valueMatcher = compiledValuePattern.matcher(entity.getWord());
+                Matcher valueMatcher = compiledValuePattern.matcher(entity.getWord());
                 if (!valueMatcher.matches()) {
                     continue;
                 }
             }
 
-            var matcher = compiledSuffixPattern.matcher(entity.getTextAfter());
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
 
             while (matcher.find()) {
-                var match = matcher.group(group);
+                String 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);
+                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE);
                     expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
                 }
             }
@@ -385,7 +303,6 @@ public class Section {
 
 
     @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) {
 
@@ -394,7 +311,6 @@ 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);
@@ -402,7 +318,6 @@ 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) {
 
@@ -411,7 +326,6 @@ 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);
@@ -419,7 +333,6 @@ 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) {
@@ -429,7 +342,6 @@ 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) {
 
@@ -439,7 +351,6 @@ 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) {
@@ -449,7 +360,6 @@ 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) {
@@ -459,7 +369,6 @@ 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) {
@@ -469,7 +378,6 @@ 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) {
@@ -479,7 +387,6 @@ 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) {
@@ -489,7 +396,6 @@ 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) {
@@ -499,7 +405,6 @@ 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) {
@@ -509,7 +414,6 @@ 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) {
 
@@ -518,7 +422,6 @@ 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) {
@@ -528,7 +431,6 @@ 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) {
@@ -538,7 +440,6 @@ 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) {
 
@@ -549,22 +450,22 @@ public class Section {
         while (matcher.find()) {
             String match = matcher.group(group);
             if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + 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)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
                 entity.setRedaction(false);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -575,7 +476,6 @@ 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) {
 
@@ -591,33 +491,24 @@ 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, false);
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE);
         EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
     }
 
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void ignore(@Argument(ArgumentType.TYPE) String type) {
 
-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.ENTITY));
-    }
+    public void ignore(String type) {
 
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void ignoreRecommendations(@Argument(ArgumentType.TYPE) String type) {
-
-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.RECOMMENDATION));
+        entities.removeIf(entity -> entity.getType().equals(type));
     }
 
 
     @ThenAction
-    @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) {
+    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) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
 
@@ -633,19 +524,17 @@ public class Section {
             while (matcher.find()) {
                 String match = matcher.group(group);
                 if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, type, false, false, 0, null, null, Engine.RULE, false));
+                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null, Engine.RULE));
                 }
             }
         }
 
         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) {
 
@@ -656,7 +545,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, false);
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE);
                 EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
             }
         }
@@ -664,16 +553,14 @@ 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, false);
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE);
         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");
@@ -690,7 +577,7 @@ public class Section {
                 }
 
                 if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(cleanValue);
+                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(cleanValue);
                 }
             }
         }
@@ -698,48 +585,12 @@ 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);
     }
 
 
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSection(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
-                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        for (SectionArea sectionArea : sectionAreas) {
-
-            RedRectangle2D position = RedRectangle2D.builder()
-                    .height(sectionArea.getHeight() + 4)
-                    .width(sectionArea.getWidth() + 4)
-                    .x(sectionArea.getTopLeft().getX() - 2)
-                    .y(sectionArea.getTopLeft().getY() - 2)
-                    .build();
-
-            log.debug("SectionArea: {}", sectionArea);
-            log.debug("Position {}", position.toString());
-
-            Image image = Image.builder()
-                    .page(sectionArea.getPage())
-                    .position(position)
-                    .redaction(true)
-                    .hasTransparency(false)
-                    .sectionNumber(sectionNumber)
-                    .section(headline)
-                    .matchedRule(ruleNumber)
-                    .legalBasis(legalBasis)
-                    .redactionReason(reason)
-                    .type(type)
-                    .build();
-
-            images.add(image);
-        }
-    }
-
-
     private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis,
                                            boolean redaction) {
 
@@ -748,19 +599,21 @@ 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, false);
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
                 EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + 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, boolean asRecommendation) {
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine) {
 
         String text = caseInsensitive ? searchText.toLowerCase() : searchText;
-        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));
+        String searchValue = caseInsensitive ? value.toLowerCase() : value;
+
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, engine, false);
+
         found.forEach(entity -> {
             if (redacted) {
                 entity.setRedaction(true);
@@ -776,8 +629,10 @@ 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)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
                 entity.setRedaction(redaction);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -810,7 +665,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, EntityType.ENTITY);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE);
             entity.setRedaction(redact);
             entity.setMatchedRule(ruleNumber);
             entity.setRedactionReason(reason);
@@ -837,9 +692,9 @@ public class Section {
                 while (matcher.find()) {
                     String match = matcher.group().trim();
                     if (match.length() >= 3) {
-                        localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(match);
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(match);
                         String lastname = match.split(" ")[0];
-                        localDictionaryAdds.computeIfAbsent(type, (x) -> new HashSet<>()).add(lastname);
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(lastname);
                     }
                 }
             }
@@ -854,7 +709,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, false);
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
                     EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                     if (redactEverywhere && !isLocal()) {
@@ -875,7 +730,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, false);
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
                 EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
             }
         }
@@ -890,7 +745,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, false);
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
                     EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                     if (redactEverywhere && !isLocal()) {
@@ -917,7 +772,7 @@ public class Section {
                             return;
                         }
 
-                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
+                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
                         EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                         if (redactEverywhere && !isLocal()) {

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

@@ -3,11 +3,9 @@ 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<>();

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

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

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

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

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

@@ -1,11 +1,9 @@
 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;
-}
+}

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

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

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

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

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

@@ -1,24 +1,15 @@
 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;
-
-    @JsonProperty(value = "imageMetadata")
-    @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    private List<ImageMetadata> data = new ArrayList<>();
+    private List<ImageMetadata> imageMetadata = new ArrayList<>();
 
 }

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

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

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

@@ -1,14 +1,12 @@
 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;
-}
+}

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

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

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

@@ -1,13 +1,33 @@
 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.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
-import com.iqser.red.service.redaction.v1.model.*;
+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.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;
@@ -15,27 +35,21 @@ import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
 
 @Slf4j
 @Service
@@ -57,7 +71,6 @@ public class AnalyzeService {
     private final ImportedRedactionService importedRedactionService;
 
 
-    @Timed("analyzeDocumentStructure")
     public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
@@ -79,7 +92,6 @@ public class AnalyzeService {
         }
 
         List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
-
         sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
 
         Text text = new Text(pageCount, sectionTexts);
@@ -106,7 +118,6 @@ public class AnalyzeService {
     }
 
 
-    @Timed("reanalyze")
     @SneakyThrows
     public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
 
@@ -120,14 +131,10 @@ 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);
@@ -137,7 +144,7 @@ public class AnalyzeService {
         if (redactionServiceSettings.isNerServiceEnabled()) {
             nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
         } else {
-            nerEntities = new NerEntities();
+            nerEntities = NerEntities.builder().build();
         }
 
         List<SectionText> reanalysisSections = text.getSectionTexts()
@@ -145,36 +152,24 @@ 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);
     }
 
 
-    @Timed("analyze")
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
@@ -184,7 +179,7 @@ public class AnalyzeService {
         if (redactionServiceSettings.isNerServiceEnabled()) {
             nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
         } else {
-            nerEntities = new NerEntities();
+            nerEntities = NerEntities.builder().build();
         }
         dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
         KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
@@ -196,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, convert(legalBasis), dictionary.getVersion()
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(), redactionLogEntries, legalBasis, dictionary.getVersion()
                 .getDossierTemplateVersion(), dictionary.getVersion()
                 .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
 
@@ -224,19 +219,13 @@ 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(), dictionaryIncrementsSearch)) {
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
                 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);
 
@@ -293,9 +282,6 @@ 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) {
 

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

@@ -1,15 +1,9 @@
-package com.iqser.red.service.redaction.v1.server.annotate;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 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;
@@ -23,7 +17,6 @@ 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.*;
@@ -33,41 +26,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class AnnotationService {
 
-    private final RedactionStorageService redactionStorageService;
-    private final DictionaryService dictionaryService;
 
-    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())
-                        .colors(annotateRequest.getColors())
-                        .types(annotateRequest.getTypes())
-                .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 {
+    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {
 
         Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = convertRedactionLog(redactionLog);
 
@@ -126,7 +86,7 @@ public class AnnotationService {
         annotations.add(annotation);
 
         if (redactionLogEntry.getComments() != null) {
-            for (RedactionLogComment comment : redactionLogEntry.getComments()) {
+            for (Comment comment : redactionLogEntry.getComments()) {
                 PDAnnotationText txtAnnot = new PDAnnotationText();
                 txtAnnot.setAnnotationName(String.valueOf(comment.getId()));
                 txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation

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

@@ -60,16 +60,6 @@ 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)) {
@@ -80,16 +70,6 @@ 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()));
-                    }
-                });
             });
         }
 
@@ -102,8 +82,7 @@ public class DictionaryService {
         try {
             DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();
 
-            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId, false)
-                    : dictionaryClient.getAllTypesForDossier(dossierId, false);
+            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
             if (CollectionUtils.isNotEmpty(typeResponse)) {
 
                 List<DictionaryModel> dictionary = typeResponse
@@ -120,37 +99,18 @@ public class DictionaryService {
                             }
 
                             Set<DictionaryEntry> entries = new HashSet<>();
-                            Set<DictionaryEntry> falsePositives = new HashSet<>();
-                            Set<DictionaryEntry> falseRecommendations = new HashSet<>();
+                            var newEntries = convertEntries(t.getId(), currentVersion);
+                            var newValues = newEntries.stream().map(v -> v.getValue()).collect(Collectors.toSet());
 
-                            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());
+                            entries.addAll(convertEntries(t.getId(), currentVersion));
 
                             return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                    .isHint(), entries, falsePositives, falseRecommendations, dossierId != null);
+                                    .isHint(), t.isRecommendation(), entries, new HashSet<>(), dossierId != null);
                         })
                         .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
@@ -180,24 +140,20 @@ public class DictionaryService {
     }
 
 
-    private DictionaryEntries getEntries(String typeId, Long fromVersion) {
+    private Set<DictionaryEntry> convertEntries(String typeId, Long fromVersion) {
 
         var type = dictionaryClient.getDictionaryForType(typeId, fromVersion);
 
-        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<>();
+        Set<DictionaryEntry> entries = new HashSet<>(type
+                .getEntries());
 
         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 new DictionaryEntries(entries, falsePositives, falseRecommendations);
+        return entries;
     }
 
 
-
     private float[] convertColor(String hex) {
 
         Color color = Color.decode(hex);
@@ -205,6 +161,16 @@ 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);
@@ -225,6 +191,16 @@ 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<>();
@@ -248,12 +224,23 @@ 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;

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

@@ -25,14 +25,12 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 
@@ -63,8 +61,6 @@ public class EntityRedactionService {
         }
 
         Map<Integer, List<Entity>> entitiesPerPage = convertToEntitiesPerPage(entities);
-        EntitySearchUtils.removeEntitiesContainedInRedactedLogos(imagesPerPage, entitiesPerPage);
-
         return new PageEntities(entitiesPerPage, imagesPerPage);
     }
 
@@ -87,7 +83,6 @@ public class EntityRedactionService {
                 surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary);
             }
 
-
             if (!local && analyzeRequest.getManualRedactions() != null) {
 
                 var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
@@ -98,10 +93,9 @@ public class EntityRedactionService {
                 var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
                         .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
                         .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getAnnotationId().equals(idr.getAnnotationId()) && forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
                         .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());
 
-
                 if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                         .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
                     for (Image image : reanalysisSection.getImages()) {
@@ -127,14 +121,13 @@ public class EntityRedactionService {
                 }));
             }
 
-            log.debug("Section {}, Images: {}", reanalysisSection.getSectionNumber(), reanalysisSection.getImages());
-
             sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                     .isLocal(false)
                     .dictionaryTypes(dictionary.getTypes())
                     .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
                             .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
-                                    .stream()).collect(Collectors.toSet()) : entities.getEntities())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities.getEntities())
                     .nerEntities(entities.getNerEntities())
                     .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                     .searchText(reanalysisSection.getSearchableText().toString())
@@ -144,10 +137,8 @@ public class EntityRedactionService {
                     .searchableText(reanalysisSection.getSearchableText())
                     .dictionary(dictionary)
                     .images(reanalysisSection.getImages())
-                    .sectionAreas(reanalysisSection.getSectionAreas())
                     .fileAttributes(analyzeRequest.getFileAttributes())
                     .build(), reanalysisSection.getSearchableText()));
-
         }
 
         Set<Entity> entities = new HashSet<>();
@@ -184,7 +175,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(), entity.getEntityType()));
+                                .getReferences()));
             }
         }
         return entitiesPerPage;
@@ -206,18 +197,26 @@ public class EntityRedactionService {
     private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {
 
         analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-            analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+            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 -> {
 
-                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);
+                });
+            }
         });
     }
 
@@ -227,20 +226,20 @@ public class EntityRedactionService {
                                   List<Integer> cellStarts) {
 
         Set<Entity> found = new HashSet<>();
-        String searchableString = searchableText.asString();
-
+        String searchableString = searchableText.toString();
         if (StringUtils.isEmpty(searchableString)) {
             return new Entities(new HashSet<>(), new HashSet<>());
         }
 
         String lowercaseInputString = searchableString.toLowerCase();
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
-
-            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);
+            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));
+            }
         }
 
         Set<Entity> nerFound = new HashSet<>();
@@ -257,10 +256,10 @@ public class EntityRedactionService {
 
         Set<Entity> entities = new HashSet<>();
 
-        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getData().containsKey(sectionNumber)) {
-            nerEntities.getData().get(sectionNumber).forEach(res -> {
+        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getResult().containsKey(sectionNumber)) {
+            nerEntities.getResult().get(sectionNumber).forEach(res -> {
                 if (cellStarts == null || cellStarts.isEmpty()) {
-                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
+                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
                 } else {
                     boolean intersectsCellStart = false;
                     for (Integer cellStart : cellStarts) {
@@ -270,7 +269,7 @@ public class EntityRedactionService {
                         }
                     }
                     if (!intersectsCellStart) {
-                        entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
+                        entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
                     }
                 }
             });

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

@@ -1,6 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -24,15 +24,14 @@ 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.forEach(redactionLogEntry -> addIntersections(redactionLogEntry, importedRedactions));
+        redactionLogEntries.removeIf(redactionLogEntry -> hasIntersections(redactionLogEntry, importedRedactions));
 
         if (addImportedRedactions) {
             return addImportedRedactionsRedactionLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
@@ -43,8 +42,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) {
@@ -54,7 +53,7 @@ public class ImportedRedactionService {
                         .imported(true)
                         .redacted(true)
                         .positions(importedRedaction.getPositions())
-                        .color(getColor(IMPORTED_REDACTION_TYPE, dossierTemplateId))
+                        .color(getColor("imported_redaction", dossierTemplateId))
                         .build();
 
                 redactionLogEntries.add(redactionLogEntry);
@@ -65,7 +64,7 @@ public class ImportedRedactionService {
     }
 
 
-    private void addIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
+    private boolean hasIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
 
         for (Rectangle rectangle : redactionLogEntry.getPositions()) {
             if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
@@ -73,15 +72,13 @@ public class ImportedRedactionService {
                 for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
                     for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
                         if (intersects(importedRedactionPosition, rectangle)) {
-                            if(redactionLogEntry.getImportedRedactionIntersections() == null){
-                                redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
-                            }
-                            redactionLogEntry.getImportedRedactionIntersections().add(importedRedaction.getId());
+                            return true;
                         }
                     }
                 }
             }
         }
+        return false;
     }
 
 

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

@@ -1,5 +1,12 @@
 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;
@@ -12,19 +19,11 @@ 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
@@ -88,10 +87,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(), new SearchImplementation(value, false),
-                new FindEntityDetails("dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, EntityType.ENTITY));
+        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, false);
         Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
 
         Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);

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

@@ -17,7 +17,6 @@ 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;
@@ -204,8 +203,7 @@ public class RedactionLogCreatorService {
                 .type(entity.getType())
                 .redacted(entity.isRedaction())
                 .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(entity.getEntityType().equals(EntityType.RECOMMENDATION))
-                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                 .section(entity.getHeadline())
                 .sectionNumber(entity.getSectionNumber())
                 .matchedRule(entity.getMatchedRule())
@@ -235,4 +233,10 @@ public class RedactionLogCreatorService {
         return dictionaryService.isHint(type, dossierTemplateId);
     }
 
+
+    private boolean isRecommendation(String type, String dossierTemplateId) {
+
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
+    }
+
 }

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

@@ -4,23 +4,14 @@ 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;
 
@@ -29,55 +20,19 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class RedactionLogMergeService {
 
+    private final DictionaryService dictionaryService;
 
     private final SectionTextService sectionTextService;
 
-    private final RedactionStorageService redactionStorageService;
 
-    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<>();
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
+                                              String dossierTemplateId, ManualRedactions manualRedactions,
+                                              Set<Integer> excludedPages) {
 
         log.info("Merging Redaction log with manual redactions");
         if (manualRedactions != null) {
 
-
-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types);
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
 
             redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
 
@@ -87,13 +42,9 @@ public class RedactionLogMergeService {
 
                 processRedactionLogEntry(manualRedactionWrappers.stream()
                         .filter(mr -> entry.getId().equals(mr.getId()))
-                        .collect(Collectors.toList()), entry, types, colors);
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
 
-                if (entry.isImported() && !entry.isRedacted()) {
-                    skippedImportedRedactions.add(entry.getId());
-                }
-
-                entry.setComments(convert(manualRedactions.getComments().get(entry.getId())));
+                entry.setComments(manualRedactions.getComments().get(entry.getId()));
 
                 if (excludedPages != null && !excludedPages.isEmpty()) {
                     entry.getPositions().forEach(pos -> {
@@ -108,12 +59,6 @@ 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;
@@ -166,7 +111,7 @@ public class RedactionLogMergeService {
 
 
     private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
-                                          RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors) {
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
 
         manualRedactionWrappers.forEach(mrw -> {
 
@@ -179,7 +124,7 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setType(imageRecategorization.getType());
                     redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
 
-                    if (isHint(types, imageRecategorization.getType())) {
+                    if (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
                         redactionLogEntry.setRedacted(false);
                         redactionLogEntry.setHint(true);
                     } else {
@@ -189,7 +134,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(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
                 }
 
                 redactionLogEntry.setReason(manualOverrideReason);
@@ -208,11 +153,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(), colors, false, redactionLogEntry.isRedacted(), true, types));
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
                         redactionLogEntry.setHint(false);
                     } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
                         manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
                     }
 
                     redactionLogEntry.setReason(manualOverrideReason);
@@ -226,7 +171,7 @@ public class RedactionLogMergeService {
             if (mrw.getItem() instanceof ManualForceRedaction) {
                 var manualForceRedact = (ManualForceRedaction) mrw.getItem();
                 String manualOverrideReason = null;
-                var dictionaryIsHint = isHint(types, redactionLogEntry.getType());
+                var dictionaryIsHint = dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId);
                 if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
                     // Forcing a skipped hint should result in a hint
                     if (dictionaryIsHint) {
@@ -234,12 +179,12 @@ public class RedactionLogMergeService {
                     } else {
                         redactionLogEntry.setRedacted(true);
                     }
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
                     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(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                 }
 
@@ -266,7 +211,7 @@ public class RedactionLogMergeService {
                     }
                 } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
                 }
 
                 redactionLogEntry.setReason(manualOverrideReason);
@@ -287,7 +232,7 @@ public class RedactionLogMergeService {
                 var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
                 String manualOverrideReason = null;
                 if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setValue(manualResizeRedact.getValue());
                     redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
@@ -295,7 +240,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(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
                     redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
@@ -326,16 +271,16 @@ public class RedactionLogMergeService {
 
 
     public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, Colors colors, List<Type> types) {
+                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
 
         for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
 
             if (shouldCreateManualEntry(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), colors, types);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
                 redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
-                redactionLogEntry.setComments(convert(comments.get(manualRedactionEntry.getAnnotationId())));
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
                 redactionLogEntry.setTextBefore(manualRedactionEntry.getTextBefore());
                 redactionLogEntry.setTextAfter(manualRedactionEntry.getTextAfter());
 
@@ -348,11 +293,6 @@ 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) {
@@ -362,7 +302,6 @@ public class RedactionLogMergeService {
                 .collect(Collectors.toList());
     }
 
-
     @SuppressWarnings("PMD.UselessParentheses")
     private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) {
         return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary())
@@ -371,7 +310,7 @@ public class RedactionLogMergeService {
 
 
     private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      Colors colors, List<Type> types) {
+                                                      String dossierTemplateId) {
 
         var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
 
@@ -382,13 +321,12 @@ public class RedactionLogMergeService {
 
         return RedactionLogEntry.builder()
                 .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), colors, manualRedactionEntry.getStatus(), types))
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
                 .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)
@@ -400,66 +338,33 @@ public class RedactionLogMergeService {
     }
 
 
-    private float[] getColor(String type, Colors colors, boolean requested, boolean isRedaction,
-                             boolean skipped, List<Type> types) {
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
 
         if (requested) {
-            return convertColor(colors.getRequestRemove());
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
         }
-        if (skipped || !isRedaction && !isHint(types, type)) {
-            return convertColor(colors.getNotRedacted());
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
         }
-        return getColor(types, type);
+        return dictionaryService.getColor(type, dossierTemplateId);
     }
 
 
-    private float[] getColorForManualAdd(String type, Colors colors, AnnotationStatus status, List<Type> types) {
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {
 
         if (status.equals(AnnotationStatus.REQUESTED)) {
-            return convertColor(colors.getRequestAdd());
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
         } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return convertColor(colors.getNotRedacted());
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
         }
-        return getColor(types, type);
+        return getColor(type, dossierTemplateId);
     }
 
 
-    private float[] getColor(List<Type> types, String type) {
+    private float[] getColor(String type, String 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;
+        return dictionaryService.getColor(type, dossierTemplateId);
     }
 
 

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

@@ -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(),null));
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
 
                 } else if (textBlock instanceof Table) {
 

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

@@ -79,7 +79,7 @@ public class SectionTextBuilderService {
                         .get(0)
                         .getSequences()
                         .get(0)
-                        .getPage(), null);
+                        .getPage());
                 sectionText.getSectionAreas().add(sectionArea);
                 sectionText.getTextBlocks().addAll(cell.getTextBlocks());
 
@@ -141,7 +141,7 @@ public class SectionTextBuilderService {
                         .get(0)
                         .getSequences()
                         .get(0)
-                        .getPage(), null);
+                        .getPage());
                 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(), null);
+                    .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
             sectionText.getSectionAreas().add(sectionArea);
         }
 
-        sectionText.setText(searchableText.asString());
+        sectionText.setText(searchableText.toString());
         sectionText.setHeadline(headline);
         sectionText.setSectionNumber(sectionNumber.intValue());
         sectionText.setTable(false);

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

@@ -31,7 +31,7 @@ public class SurroundingWordsService {
                 if (dictionary != null && dictionary.isHint(entity.getType())) {
                     continue;
                 }
-                findSurroundingWords(entity, searchableText.asString(), entity.getStart(), entity.getEnd());
+                findSurroundingWords(entity, searchableText.toString(), 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.asString();
+            String searchableString = searchableText.toString();
 
             if (cellstarts != null) {
                 for (int i = 0; i < cellstarts.size(); i++) {

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

@@ -1,57 +1,90 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-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.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 lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 @UtilityClass
 @SuppressWarnings("PMD")
 public class EntitySearchUtils {
 
+    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {
 
-    public boolean sectionContainsAny(String sectionText, SearchImplementation searchImplementation) {
-        return searchImplementation.atLeastOneMatches(sectionText);
+        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 Set<Entity> findEntities(String inputString, SearchImplementation searchImplementation, DictionaryModel type, FindEntityDetails details) {
 
-        Set<Entity> found = find(inputString, searchImplementation, details);
+    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
+                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine, boolean ignoreMinLength) {
 
-        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);
+        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);
         }
-
         return found;
     }
 
-    public Set<Entity> find(String inputString, SearchImplementation searchImplementation, FindEntityDetails findEntityDetails) {
-        Set<Entity> entities = new HashSet<>();
 
-        searchImplementation.getMatches(inputString).forEach(match -> validateAndAddEntity(entities, findEntityDetails, inputString, match.getStartIndex(), match.getEndIndex()));
+    private boolean isSeparator(char 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()));
-        }
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
     }
 
 
@@ -65,10 +98,13 @@ 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 || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
+                    .trim(), dictionary == null ? true : dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
 
             for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                 try {
@@ -85,22 +121,6 @@ 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<>();
@@ -108,44 +128,16 @@ 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()) {
-                    if (word.getEntityType().equals(EntityType.RECOMMENDATION) && inner.getEntityType().equals(EntityType.ENTITY)) {
+                    // FIXME this is workaround for RED-3327 and should be removed in the future.
+                    if(word.getType().contains("recommendation_") && !inner.getType().contains("recommendation_")) {
                         wordsToRemove.add(word);
-                    } else if(!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
-                            inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
+                    } else {
                         wordsToRemove.add(inner);
                     }
                 }
             }
         }
-        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);
-
-            }
-        }
+        entities.removeAll(wordsToRemove);
     }
 
 
@@ -159,23 +151,13 @@ public class EntitySearchUtils {
 
         if (entities.contains(found)) {
             Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if (existingOptional.isEmpty()) {
+            if (!existingOptional.isPresent()) {
                 return;
             }
             var existing = existingOptional.get();
 
             if (existing.getType().equals(found.getType())) {
                 existing.getEngines().addAll(found.getEngines());
-                existing.setLegalBasis(found.getLegalBasis());
-                existing.setMatchedRule(found.getMatchedRule());
-                existing.setRedactionReason(found.getRedactionReason());
-                if (existing.getEntityType().equals(EntityType.RECOMMENDATION) && found.getEntityType().equals(EntityType.ENTITY)
-                        || existing.getEntityType().equals(EntityType.ENTITY) && found.getEntityType().equals(EntityType.RECOMMENDATION)) {
-                    existing.setEntityType(EntityType.ENTITY);
-                    if (found.isRedaction()) {
-                        existing.setRedaction(true);
-                    }
-                }
             } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
                 entities.remove(found);
                 entities.add(found);
@@ -193,17 +175,22 @@ public class EntitySearchUtils {
     }
 
 
-    private boolean isImageOverlappingEntity(Image image, Entity entity) {
+    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
 
-        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();
+        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);
+            }
+        }
     }
 
 
@@ -223,35 +210,11 @@ public class EntitySearchUtils {
     }
 
 
-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
-
-        for (Entity toAdd : toBeAdded) {
-            if (existing.contains(toAdd)) {
-                Optional<Entity> existingOptional = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
-                if (existingOptional.isEmpty()) {
-                    return;
-                }
-                var existingEntity = existingOptional.get();
-                existingEntity.getEngines().addAll(toAdd.getEngines());
-                existingEntity.setLegalBasis(toAdd.getLegalBasis());
-                existingEntity.setMatchedRule(toAdd.getMatchedRule());
-                existingEntity.setRedactionReason(toAdd.getRedactionReason());
-            } else {
-                existing.add(toAdd);
-            }
-        }
-    }
-
-    /*
-     * returns true if the found entity overlaps with an existing entity in a way
-     * that neither entity is a subset of the other
-     */
     private boolean overlaps(Set<Entity> existingEntities, Entity found) {
 
         for (Entity existing : existingEntities) {
 
-            // skip if either start or end is equal
-            if (existing.getStart().equals(found.getStart()) || existing.getEnd().equals(found.getEnd())) {
+            if(existing.getStart().equals(found.getStart())){
                 continue;
             }
 

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

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

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

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

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

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

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

@@ -31,12 +31,10 @@ 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.getData().forEach(imageMetadata -> {
+        imageServiceResponse.getImageMetadata().stream().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()));

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

@@ -1,27 +1,5 @@
 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;
@@ -35,11 +13,38 @@ 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;
@@ -55,10 +60,11 @@ 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);
@@ -72,12 +78,15 @@ public class PdfSegmentationService {
                 Document document = new Document();
                 List<Page> pages = new ArrayList<>();
 
-                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(1024 * 1024 * 64));
-                pdDocument.setAllSecurityToBeRemoved(true);
+                pdDocument = reinitializePDDocument(tempFile, null);
                 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);
@@ -98,7 +107,6 @@ 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);
@@ -126,10 +134,11 @@ 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");
                 }
 
@@ -143,6 +152,23 @@ 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()) {

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

@@ -1,31 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
-import com.iqser.red.service.redaction.v1.server.classification.model.Header;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.server.classification.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import java.util.stream.Collectors;
 
-@Slf4j
 @Service
 public class SectionsBuilderService {
 
@@ -68,7 +53,8 @@ public class SectionsBuilderService {
                     continue;
                 }
 
-                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification()
+                        .startsWith("H ") || !document.isHeadlines()) {
                     Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                     chunkBlock.setHeadline(lastHeadline);
                     if (document.isHeadlines()) {
@@ -114,19 +100,17 @@ public class SectionsBuilderService {
 
     public void addImagesToSections(Document document) {
 
-        Map<Integer, List<Paragraph>> paragraphMap = new HashMap<>();
+        Map<Integer, SortedSet<Paragraph>> paragraphMap = new HashMap<>();
         for (Paragraph paragraph : document.getParagraphs()) {
             for (AbstractTextContainer container : paragraph.getPageBlocks()) {
-
-                paragraphMap.computeIfAbsent(container.getPage(), c -> new ArrayList<>()).add(paragraph);
-
+                paragraphMap.computeIfAbsent(container.getPage(), x -> new TreeSet<>()).add(paragraph);
             }
         }
 
         if (paragraphMap.isEmpty()) {
             Paragraph paragraph = new Paragraph();
             document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
         }
 
         // first page is always a paragraph, else we can't process pages 1..N,
@@ -134,12 +118,12 @@ public class SectionsBuilderService {
         if (paragraphMap.get(1) == null) {
             Paragraph paragraph = new Paragraph();
             document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
         }
 
         for (Page page : document.getPages()) {
             for (PdfImage image : page.getImages()) {
-                List<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
+                SortedSet<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
                 if (paragraphsOnPage == null) {
                     int i = page.getPageNumber();
                     while (paragraphsOnPage == null) {
@@ -147,63 +131,27 @@ public class SectionsBuilderService {
                         i--;
                     }
                 }
-                for (Paragraph paragraph : paragraphsOnPage) {
-                    Float xMin = null;
-                    Float yMin = null;
-                    Float xMax = null;
-                    Float yMax = null;
 
+                Float perviousEnd = 0f;
+                for (Paragraph paragraph : paragraphsOnPage) {
+                    Float currentEnd = 0f;
                     for (AbstractTextContainer abs : paragraph.getPageBlocks()) {
                         if (abs.getPage() != page.getPageNumber()) {
                             continue;
                         }
-
-                        if (abs.getMinX() < abs.getMaxX()) {
-                            if (xMin == null || abs.getMinX() < xMin) {
-                                xMin = abs.getMinX();
-                            }
-                            if (xMax == null || abs.getMaxX() > xMax) {
-                                xMax = abs.getMaxX();
-                            }
-                        } else {
-                            if (xMin == null || abs.getMaxX() < xMin) {
-                                xMin = abs.getMaxX();
-                            }
-                            if (xMax == null || abs.getMinX() > xMax) {
-                                xMax = abs.getMinX();
-                            }
+                        if (abs.getMaxY() > currentEnd) {
+                            currentEnd = abs.getMaxY();
                         }
-
-                        if (abs.getMinY() < abs.getMaxY()) {
-                            if (yMin == null || abs.getMinY() < yMin) {
-                                yMin = abs.getMinY();
-                            }
-                            if (yMax == null || abs.getMaxY() > yMax) {
-                                yMax = abs.getMaxY();
-                            }
-                        } else {
-                            if (yMin == null || abs.getMaxY() < yMin) {
-                                yMin = abs.getMaxY();
-                            }
-                            if (yMax == null || abs.getMinY() > yMax) {
-                                yMax = abs.getMinY();
-                            }
-                        }
-
                     }
 
-                    log.debug("Image position x: {}, y: {}", image.getPosition().getX(), image.getPosition().getY());
-                    log.debug("Paragraph position xMin: {}, xMax: {}, yMin: {}, yMax: {}", xMin, xMax, yMin, yMax);
-
-                    if (xMin != null && xMax != null && yMin != null && yMax != null && image.getPosition().getX() >= xMin && image.getPosition()
-                            .getX() <= xMax && image.getPosition().getY() >= yMin && image.getPosition().getY() <= yMax) {
+                    if (image.getPosition().getY() >= perviousEnd && image.getPosition().getY() <= currentEnd) {
                         paragraph.getImages().add(image);
                         image.setAppendedToParagraph(true);
                     }
+                    perviousEnd = currentEnd;
                 }
                 if (!image.isAppendedToParagraph()) {
-                    log.debug("Image uses first paragraph");
-                    paragraphsOnPage.get(0).getImages().add(image);
+                    paragraphsOnPage.first().getImages().add(image);
                     image.setAppendedToParagraph(true);
                 }
             }
@@ -218,7 +166,9 @@ public class SectionsBuilderService {
             List<Cell> previousTableNonHeaderRow = getRowWithNonHeaderCells(previousTable);
             List<Cell> tableNonHeaderRow = getRowWithNonHeaderCells(currentTable);
             // Allow merging of tables if header row is separated from first logical non-header row
-            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows().get(0).size() == tableNonHeaderRow.size()) {
+            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows()
+                    .get(0)
+                    .size() == tableNonHeaderRow.size()) {
                 previousTableNonHeaderRow = previousTable.getRows().get(0).stream().map(cell -> {
                     Cell fakeCell = new Cell(cell.getPoints()[0], cell.getPoints()[2]);
                     fakeCell.setHeaderCells(Collections.singletonList(cell));
@@ -228,7 +178,8 @@ public class SectionsBuilderService {
             if (previousTableNonHeaderRow.size() == tableNonHeaderRow.size()) {
                 for (int i = currentTable.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
                     List<Cell> row = currentTable.getRows().get(i);
-                    if (row.size() == tableNonHeaderRow.size() && row.stream().allMatch(cell -> cell.getHeaderCells().isEmpty())) {
+                    if (row.size() == tableNonHeaderRow.size() && row.stream()
+                            .allMatch(cell -> cell.getHeaderCells().isEmpty())) {
                         for (int j = 0; j < row.size(); j++) {
                             row.get(j).setHeaderCells(previousTableNonHeaderRow.get(j).getHeaderCells());
                         }
@@ -278,20 +229,24 @@ public class SectionsBuilderService {
             TextBlock wordBlock = (TextBlock) container;
 
             if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
+                        .getSequences(), wordBlock.getRotation());
                 textBlock.setPage(wordBlock.getPage());
             } else if (splitByTable) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
+                        .getSequences(), wordBlock.getRotation());
                 textBlock.setPage(wordBlock.getPage());
                 alreadyAdded = false;
             } else if (pageBefore != -1 && wordBlock.getPage() != pageBefore) {
                 textBlock.setPage(pageBefore);
                 paragraph.getPageBlocks().add(textBlock);
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
+                        .getSequences(), wordBlock.getRotation());
                 textBlock.setPage(wordBlock.getPage());
             } else {
                 TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
+                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
+                        .getHeight());
             }
             pageBefore = wordBlock.getPage();
             splitByTable = false;
@@ -313,7 +268,11 @@ public class SectionsBuilderService {
 
     private boolean hasInvalidHeaderInformation(Table table) {
 
-        return table.getRows().stream().flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells()))).findAny().isEmpty();
+        return table.getRows()
+                .stream()
+                .flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
+                .findAny()
+                .isEmpty();
 
     }
 

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

@@ -1,7 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.storage;
 
-import com.dslplatform.json.DslJson;
-import com.dslplatform.json.runtime.Settings;
+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.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
@@ -12,26 +16,19 @@ 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 StorageService storageService;
     private final ObjectMapper objectMapper;
-
-    private final DslJson<Object> dslJson = new DslJson<>(Settings.basicSetup());
+    private final StorageService storageService;
 
 
     @SneakyThrows
@@ -43,23 +40,8 @@ public class RedactionStorageService {
 
     @SneakyThrows
     public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
-        var baos = new ByteArrayOutputStream();
-        try {
-            dslJson.serialize(any, baos);
-        } catch (com.dslplatform.json.SerializationException e){
-            // Fails on file 49 Cyprodinil - EU AIR3 - MCA Section 8 Supplement - Ecotoxicological studies on the active substance.pdf
-            var bytes = objectMapper.writeValueAsBytes(any);
-            storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), bytes);
-            dslJson.newWriter();
-            return;
-        }
-        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), baos.toByteArray());
-    }
 
-    @SneakyThrows
-    public void storeObject(String dossierId, String fileId, FileType fileType, InputStream inputStream) {
-
-        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), inputStream);
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
     }
 
 
@@ -74,7 +56,7 @@ public class RedactionStorageService {
         }
 
         try {
-            return dslJson.deserialize(ImportedRedactions.class, inputStreamResource.getInputStream());
+            return objectMapper.readValue(inputStreamResource.getInputStream(), ImportedRedactions.class);
         } catch (IOException e) {
             throw new RuntimeException("Could not imported redactions", e);
         }
@@ -92,7 +74,7 @@ public class RedactionStorageService {
         }
 
         try {
-            return dslJson.deserialize(RedactionLog.class, inputStreamResource.getInputStream());
+            return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
         } catch (IOException e) {
             throw new RuntimeException("Could not convert RedactionLog", e);
         }
@@ -110,7 +92,7 @@ public class RedactionStorageService {
         }
 
         try {
-            return dslJson.deserialize(Text.class, inputStreamResource.getInputStream());
+            return objectMapper.readValue(inputStreamResource.getInputStream(), Text.class);
         } catch (IOException e) {
             throw new RuntimeException("Could not convert Text", e);
         }
@@ -127,7 +109,7 @@ public class RedactionStorageService {
         }
 
         try {
-            return dslJson.deserialize(NerEntities.class, inputStreamResource.getInputStream());
+            return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
         } catch (IOException e) {
             throw new RuntimeException("Could not convert NER Entities", e);
         }
@@ -138,7 +120,7 @@ public class RedactionStorageService {
 
         try {
             var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
-            return dslJson.deserialize(SectionGrid.class, sectionGrid.getInputStream());
+            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
         } catch (StorageObjectDoesNotExist e) {
             throw new NotFoundException("Section Grid is not available.");
         } catch (IOException e) {

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

@@ -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,13 +33,11 @@ public abstract class AbstractTextContainer {
     }
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getHeight() {
         return maxY - minY;
     }
-
+    
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getWidth() {
         return maxX - minX;
     }

redaction-service-v1/redaction-service-server-v1/src/main/resources/application.yml

@@ -9,8 +9,6 @@ server:
   port: 8080
 
 spring:
-  main:
-    allow-circular-references: true # FIXME
   profiles:
     active: kubernetes
   rabbitmq:

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DictionaryServiceTest.java

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

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java

@@ -10,15 +10,15 @@ import org.springframework.core.io.InputStreamResource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.Map;
 
-public class FileSystemBackedStorageService implements StorageService{
+public class FileSystemBackedStorageService extends S3StorageService {
 
     private final Map<String, File> dataMap = new HashMap<>();
 
     public FileSystemBackedStorageService() {
+        super(null, null);
     }
 
     @SneakyThrows
@@ -33,47 +33,12 @@ public class FileSystemBackedStorageService implements StorageService{
 
     }
 
-    @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("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));
+        IOUtils.write(data, new FileOutputStream(tempFile));
 
         dataMap.put(objectId, tempFile);
     }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server;
 
 import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.core.type.TypeReference;
 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;
@@ -14,14 +13,12 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.do
 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.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;
@@ -59,7 +56,6 @@ import java.io.*;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -90,14 +86,17 @@ 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;
 
@@ -130,8 +129,6 @@ 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<>();
@@ -195,10 +192,10 @@ public class RedactionIntegrationTest {
         loadTypeForTest();
         loadNerForTest();
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID, false)).thenReturn(getTypeResponse());
+        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(getTypeResponse());
 
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID, false)).thenReturn(List.of(Type.builder()
+        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID)).thenReturn(List.of(Type.builder()
                 .id(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)
                 .type(DOSSIER_REDACTIONS)
                 .dossierTemplateId(TEST_DOSSIER_ID)
@@ -215,7 +212,7 @@ public class RedactionIntegrationTest {
         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));
@@ -229,6 +226,9 @@ public class RedactionIntegrationTest {
         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(RECOMMENDATION_AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, 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));
@@ -244,6 +244,7 @@ public class RedactionIntegrationTest {
     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();
@@ -255,6 +256,7 @@ 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();
@@ -284,7 +286,7 @@ public class RedactionIntegrationTest {
         dictionary.get(AUTHOR).add("Drinking water");
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(1L);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -308,8 +310,6 @@ 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());
 
@@ -328,7 +328,6 @@ public class RedactionIntegrationTest {
 
 
     @Test
-    @Ignore
     @SneakyThrows
     public void testIgnoreHint() {
 
@@ -493,6 +492,8 @@ 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);
 
@@ -500,6 +501,7 @@ public class RedactionIntegrationTest {
 
         when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, null)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
 
         start = System.currentTimeMillis();
 
@@ -521,7 +523,7 @@ public class RedactionIntegrationTest {
         end = System.currentTimeMillis();
         System.out.println("reanalysis analysis duration: " + (end - start));
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -585,7 +587,7 @@ public class RedactionIntegrationTest {
 
         assertThat(changes.size()).isEqualTo(2);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -663,6 +665,7 @@ 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);
@@ -671,6 +674,7 @@ public class RedactionIntegrationTest {
 
         when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, null)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
 
         start = System.currentTimeMillis();
 
@@ -692,7 +696,7 @@ public class RedactionIntegrationTest {
         end = System.currentTimeMillis();
         System.out.println("reanalysis analysis duration: " + (end - start));
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -717,72 +721,6 @@ public class RedactionIntegrationTest {
     }
 
 
-    @Test
-    public void testRemovePublishedInformations() throws IOException {
-
-        long start = System.currentTimeMillis();
-
-        ClassPathResource colorsResource = new ClassPathResource("colors/colors.json");
-        var colors = objectMapper.readValue(colorsResource.getInputStream(), Colors.class);
-
-        ClassPathResource typeResource = new ClassPathResource("colors/types.json");
-        TypeReference<List<Type>> typeRefForTypes = new TypeReference<>(){};
-        List<Type> types = objectMapper.readValue(typeResource.getInputStream(), typeRefForTypes);
-
-
-        AnalyzeRequest request = prepareStorage("files/new/PublishedInformationTest.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        ManualRedactions manualRedactions = new ManualRedactions();
-        manualRedactions.getIdsToRemove().add(IdRemoval.builder()
-                .annotationId("308dab9015bfafd911568cffe0a7f7de")
-                .fileId(TEST_FILE_ID)
-                .status(AnnotationStatus.APPROVED)
-                        .requestDate(OffsetDateTime.of(2022,05,23,8,30,07,475479,  ZoneOffset.UTC))
-                        .processedDate(OffsetDateTime.of(2022,05,23,8,30,07,483651,  ZoneOffset.UTC))
-                .build());
-
-        manualRedactions.getForceRedactions().add(ManualForceRedaction.builder()
-                .annotationId("0b56ea1a87c83f351df177315af94f0d")
-                .fileId(TEST_FILE_ID)
-                .status(AnnotationStatus.APPROVED)
-                .requestDate(OffsetDateTime.of(2022,05,23,9,30,15,4653, ZoneOffset.UTC))
-                .processedDate(OffsetDateTime.of(2022,05,23,9,30,15,794,  ZoneOffset.UTC))
-                .build());
-
-        manualRedactions.getIdsToRemove().add(IdRemoval.builder()
-                .annotationId("0b56ea1a87c83f351df177315af94f0d")
-                .fileId(TEST_FILE_ID)
-                .status(AnnotationStatus.APPROVED)
-                .requestDate(OffsetDateTime.of(2022,05,23,8,30,23,961721,  ZoneOffset.UTC))
-                .processedDate(OffsetDateTime.of(2022,05,23,8,30,23,96528,  ZoneOffset.UTC))
-                .build());
-
-
-
-        request.setManualRedactions(manualRedactions);
-
-
-        AnalyzeResult result = analyzeService.analyze(request);
-
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                        .manualRedactions(manualRedactions)
-                        .colors(colors)
-                        .types(types)
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-        long end = System.currentTimeMillis();
-
-        System.out.println("duration: " + (end - start));
-        System.out.println("numberOfPages: " + result.getNumberOfPages());
-    }
-
-
     @Test
     public void testTableRedaction() throws IOException {
 
@@ -793,7 +731,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -883,7 +821,7 @@ public class RedactionIntegrationTest {
 
         var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1017,7 +955,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1033,7 +971,6 @@ public class RedactionIntegrationTest {
 
 
     @Test
-    @Ignore
     public void resizeRedactionTest() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
@@ -1149,7 +1086,7 @@ public class RedactionIntegrationTest {
 
         analyzeService.reanalyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
@@ -1173,7 +1110,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1189,7 +1126,6 @@ public class RedactionIntegrationTest {
 
 
     @Test
-    @Ignore
     public void testManualSurroundingText() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/new/S4.pdf");
@@ -1250,7 +1186,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
                 .fileId(TEST_FILE_ID)
@@ -1327,6 +1263,21 @@ 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()
@@ -1363,13 +1314,6 @@ 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()));
-
     }
 
 
@@ -1423,6 +1367,9 @@ 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");
@@ -1442,6 +1389,9 @@ 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);
@@ -1462,6 +1412,9 @@ 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);
@@ -1482,6 +1435,9 @@ 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);
@@ -1491,6 +1447,7 @@ 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);
@@ -1503,6 +1460,8 @@ 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);
@@ -1552,8 +1511,6 @@ 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))
@@ -1597,7 +1554,7 @@ public class RedactionIntegrationTest {
 
         var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1607,44 +1564,6 @@ 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) {

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/AnalyseFileRealDataIntegrationTest.java

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

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/realdata/LiveDataIntegrationTest.java

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

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/utils/EntitySearchUtilsTest.java

@@ -9,7 +9,6 @@ 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 {
 
@@ -17,8 +16,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, EntityType.ENTITY);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         entities.add(nested);
         entities.add(nesting);
         EntitySearchUtils.removeEntitiesContainedInLarger(entities);
@@ -40,14 +39,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, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         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, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         foundEntities.add(foundEntities1);
         foundEntities.add(foundEntities2);
 
@@ -73,14 +72,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, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         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, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         foundEntities.add(foundEntities1);
         foundEntities.add(foundEntities2);
 
@@ -105,14 +104,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,EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         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, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         foundEntities.add(foundEntities1);
         foundEntities.add(foundEntities2);
 
@@ -137,25 +136,22 @@ 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, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         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, 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);
+        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);
         foundEntities.add(foundEntities1);
         foundEntities.add(foundEntities2);
-        foundEntities.add(foundEntities3);
 
         // Act
         Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
 
         // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result.contains(foundEntities2));
+        assertThat(result.size()).isEqualTo(0);
 
     }
 
@@ -170,27 +166,22 @@ 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, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        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);
         existingEntities.add(existingEntity1);
         existingEntities.add(existingEntity2);
 
         Set<Entity> foundEntities = new HashSet<>();
-        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);
+        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);
 
         // Act
         Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
 
         // Assert
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result).containsExactlyInAnyOrder(foundEntitiesSubset1, foundEntitiesSubset2);
+        assertThat(result.size()).isEqualTo(0);
 
     }
 

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java

@@ -94,7 +94,7 @@ public class PdfSegmentationServiceTest {
         ImageServiceResponse imageServiceResponse = objectMapper.readValue(responseJson.getInputStream(), ImageServiceResponse.class);
 
         Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getData().stream().forEach(imageMetadata -> {
+        imageServiceResponse.getImageMetadata().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()));
         });

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/stringmatching/StringMatchingPerformanceTest.java

@@ -1,85 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.stringmatching;
-
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
-import lombok.SneakyThrows;
-import org.ahocorasick.trie.Trie;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-@RunWith(SpringRunner.class)
-public class StringMatchingPerformanceTest {
-
-    @Test
-    @SneakyThrows
-    public void testStringPerformance() {
-
-        String text = IOUtils.toString(new ClassPathResource("stringmatching/hamlet.txt").getInputStream()).toLowerCase();
-        Set<String> dictionary = IOUtils.readLines(new ClassPathResource("stringmatching/names.txt").getInputStream())
-                .stream()
-                .map(String::toLowerCase).collect(Collectors.toSet());
-
-        System.out.println("Loaded text has a length of " + text.length() + " symbols");
-        System.out.println("Dictionary has " + dictionary.size() + " entries");
-
-        var patterns = dictionary.stream()
-                .map(p -> Pattern.compile(Pattern.quote(p))).collect(Collectors.toList());
-        var trie = Trie.builder().ignoreCase().addKeywords(dictionary).build();
-
-
-        // 1. Naive approach
-        long t1 = System.currentTimeMillis();
-        var naiveIndexes = new HashSet<Index>();
-        for (var entry : dictionary) {
-            var startIndex = 0;
-            do {
-                startIndex = text.indexOf(entry, startIndex + 1);
-                if (startIndex != -1) {
-                    naiveIndexes.add(new Index(startIndex, startIndex + entry.length()));
-                }
-            } while (startIndex != -1);
-        }
-        long t2 = System.currentTimeMillis();
-        System.out.println("Naive approach found " + naiveIndexes.size() + " entries in " + (t2 - t1) + "ms");
-
-
-        // 2. Boyer Moore
-        t1 = System.currentTimeMillis();
-        var boyerMooreIndexes = new HashSet<Index>();
-        for (var pattern : patterns) {
-            boyerMooreIndexes.addAll(pattern.matcher(text).results().map(r -> new Index(r.start(), r.end())).collect(Collectors.toList()));
-        }
-        t2 = System.currentTimeMillis();
-        System.out.println("Boyer Moore found " + boyerMooreIndexes.size() + " entries in " + (t2 - t1) + "ms");
-
-
-        // 3. Aho Corasick
-        t1 = System.currentTimeMillis();
-        var result = trie.parseText(text);
-        var ahoCorasickIndexes = result.stream().map(r -> new Index(r.getStart(), r.getEnd() + 1)).collect(Collectors.toSet());
-        t2 = System.currentTimeMillis();
-        System.out.println("Aho Corasick found " + ahoCorasickIndexes.size() + " entries in " + (t2 - t1) + "ms");
-
-
-        // Assert that all algorithms are equal
-        assertThat(naiveIndexes).isEqualTo(boyerMooreIndexes).isEqualTo(ahoCorasickIndexes);
-
-    }
-
-    @AllArgsConstructor
-    @EqualsAndHashCode(of = {"start", "end"})
-    public static class Index {
-        int start;
-        int end;
-    }
-}

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -9,7 +9,6 @@ ribbon:
 spring:
   main:
     allow-bean-definition-overriding: true
-    allow-circular-references: true # FIXME
 
 processing.kafkastreams: false
 

redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/colors.json

@@ -1,13 +0,0 @@
-{
-  "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-  "defaultColor": "#9398a0",
-  "requestAdd": "#04b093",
-  "requestRemove": "#04b093",
-  "notRedacted": "#c498fa",
-  "analysisColor": "#dd4d50",
-  "updatedColor": "#fdbd00",
-  "dictionaryRequestColor": "#5b97db",
-  "manualRedactionColor": "#9398a0",
-  "previewColor": "#9398a0",
-  "ignoredHintColor": "#e7d4ff"
-}

redaction-service-v1/redaction-service-server-v1/src/test/resources/colors/types.json

@@ -1,223 +0,0 @@
-[
-  {
-    "id": "CBI_address:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "CBI_address",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 140,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "All site names and addresses, and location (e.g. Syngenta, Monthey, GPS Co-ordinates, Mr Smith of … providing the…). Except addresses in published literature and the applicant address.",
-    "addToDictionaryAction": true,
-    "label": "CBI Address",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "CBI_author:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "CBI_author",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 130,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "All authors named in the study documentation. Except names in published literature.",
-    "addToDictionaryAction": true,
-    "label": "CBI Author",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "PII:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "PII",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 150,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "Not authors but listed in the document: Names, signatures, telephone, email etc.; e.g. Reg Manager, QA Manager",
-    "addToDictionaryAction": true,
-    "label": "PII",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "formula:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "formula",
-    "hexColor": "#036ffc",
-    "recommendationHexColor": "#8df06c",
-    "rank": 1002,
-    "isHint": true,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Empty dictionary used to configure formula colors.",
-    "addToDictionaryAction": false,
-    "label": "Formula",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "isHint_only:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "isHint_only",
-    "hexColor": "#fa98f7",
-    "recommendationHexColor": "#8df06c",
-    "rank": 50,
-    "isHint": true,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Entries of this dictionary will be highlighted only",
-    "addToDictionaryAction": false,
-    "label": "isHint Only",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "image:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "image",
-    "hexColor": "#bdd6ff",
-    "recommendationHexColor": "#8df06c",
-    "rank": 999,
-    "isHint": true,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Empty dictionary used to configure image colors.",
-    "addToDictionaryAction": false,
-    "label": "Image",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "logo:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "logo",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 1001,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Empty dictionary used to configure logo colors.",
-    "addToDictionaryAction": false,
-    "label": "Logo",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "must_redact:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "must_redact",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 100,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Entries of this dictionary get redacted wherever found.",
-    "addToDictionaryAction": false,
-    "label": "Must Redact",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "ocr:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "ocr",
-    "hexColor": "#bdd6ff",
-    "recommendationHexColor": "#8df06c",
-    "rank": 1000,
-    "isHint": true,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Empty dictionary used to configure ocr colors.",
-    "addToDictionaryAction": false,
-    "label": "Ocr",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "signature:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "signature",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 1003,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": true,
-    "isRecommendation": false,
-    "description": "Empty dictionary used to configure signature colors.",
-    "addToDictionaryAction": false,
-    "label": "Signature",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "imported_redaction:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "imported_redaction",
-    "hexColor": "#f0f0c0",
-    "recommendationHexColor": "#8df06c",
-    "rank": 9999,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "Redaction Annotations that were imported from documents",
-    "addToDictionaryAction": false,
-    "label": "Imported Redaction",
-    "hasDictionary": false,
-    "systemManaged": true,
-    "autoHideSkipped": true
-  },
-  {
-    "id": "published_information:31039447-9040-4376-9ca7-614e56b284b9",
-    "type": "published_information",
-    "hexColor": "#85ebff",
-    "recommendationHexColor": "#8df06c",
-    "rank": 70,
-    "isHint": true,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "Manual managed list of public journals and papers that need no redaction",
-    "addToDictionaryAction": true,
-    "label": "Published Information",
-    "hasDictionary": true,
-    "systemManaged": false,
-    "autoHideSkipped": false
-  },
-  {
-    "id": "dossier_redaction:31039447-9040-4376-9ca7-614e56b284b9:5dfb2724-74a4-4a1a-a1eb-165e7943ffcd",
-    "type": "dossier_redaction",
-    "hexColor": "#9398a0",
-    "recommendationHexColor": null,
-    "rank": 1500,
-    "isHint": false,
-    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
-    "isCaseInsensitive": false,
-    "isRecommendation": false,
-    "description": "Entries in this dictionary will only be redacted in this dossier",
-    "addToDictionaryAction": false,
-    "label": "Dossier Redaction",
-    "hasDictionary": true,
-    "systemManaged": true,
-    "autoHideSkipped": false
-  }
-]

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/CBI_author.txt

@@ -8620,6 +8620,4 @@ Doe
 M. Mustermann
 F. Lastname
 Mustermann
-Lastname
-Bojangles
-Tambourine Man
+Lastname

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/PII_false_positive.txt

@@ -1 +0,0 @@
-C. J. Alfred Xinyi

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/false_positive.txt

@@ -0,0 +1,239 @@
+(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

redaction-service-v1/redaction-service-server-v1/src/test/resources/dictionaries/published_information.txt

@@ -86,4 +86,3 @@ Toxicol Sci
 Toxicol Sci.
 Toxicol Sci. 1
 Test Ignored Hint Published Information
-Workshop