Pull request #410: RED-4218: Do not perform surrounding text analysis for resize redactions with value = null

Merge in RED/redaction-service from RED-4218 to release/3.107.x

* commit '3c09f0a63f9e0010ce65d9d6281606c6118365d3':
  RED-4218: Do not perform surrounding text analysis for resize redactions with value = null

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

@@ -1,12 +1,10 @@
 package buildjob;
 
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
-
+import java.time.DayOfWeek;
 import java.time.LocalTime;
 
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
-import com.atlassian.bamboo.specs.api.builders.Variable;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
 import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
 import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
@@ -19,16 +17,20 @@ import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
 import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
 import com.atlassian.bamboo.specs.api.builders.project.Project;
 import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
-import com.atlassian.bamboo.specs.builders.task.CleanWorkingDirectoryTask;
+import com.atlassian.bamboo.specs.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;
 import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger;
 import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
 import com.atlassian.bamboo.specs.util.BambooServer;
+import com.atlassian.bamboo.specs.builders.task.ScriptTask;
+import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
+
+import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
 
 /**
  * Plan configuration for Bamboo.
@@ -39,15 +41,14 @@ public class PlanSpec {
 
     private static final String SERVICE_NAME = "redaction-service";
 
-    private static final String JVM_ARGS = " -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
+    private static final String JVM_ARGS =" -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
 
     private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
 
-
     /**
      * Run main to publish plan on Bamboo
      */
-    public static void main(final String[] args) {
+    public static void main(final String[] args) throws Exception {
         //By default credentials are read from the '.credentials' file.
         BambooServer bambooServer = new BambooServer("http://localhost:8085");
 
@@ -56,21 +57,15 @@ public class PlanSpec {
         PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
         bambooServer.publish(planPermission);
 
-        Plan nightPlan = new PlanSpec().createNightPlan();
-        bambooServer.publish(nightPlan);
-        PlanPermissions nightPlanPermission = new PlanSpec().createPlanPermission(nightPlan.getIdentifier());
-        bambooServer.publish(nightPlanPermission);
-
         Plan secPlan = new PlanSpec().createSecBuild();
         bambooServer.publish(secPlan);
         PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
         bambooServer.publish(secPlanPermission);
     }
 
-
     private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
-
-        Permissions permission = new Permissions().userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
+        Permissions permission = new Permissions()
+                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
                 .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                 .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                 .loggedInUserPermissions(PermissionType.VIEW)
@@ -78,104 +73,105 @@ public class PlanSpec {
         return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
     }
 
-
     private Project project() {
-
-        return new Project().name("RED").key(new BambooKey("RED"));
+        return new Project()
+                .name("RED")
+                .key(new BambooKey("RED"));
     }
 
-
     public Plan createPlan() {
-
-        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Plan created from (enter repository url of your plan)")
+        return new Plan(
+                project(),
+                SERVICE_NAME, new BambooKey(SERVICE_KEY))
+                .description("Plan created from (enter repository url of your plan)")
                 .variables(new Variable("maven_add_param", ""))
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", 
-                        new BambooKey("JOB1")).tasks(
-                                new CleanWorkingDirectoryTask()
-                                        .description("Clean working directory.")
-                                        .enabled(true), 
-                                new VcsCheckoutTask().description("Checkout Default Repository")
-                                        .cleanCheckout(true)
-                                        .checkoutItems(
-                                                new CheckoutItem()
-                                                        .defaultRepository()), 
-                                new ScriptTask().description("Build")
-                                        .location(Location.FILE)
-                                        .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                        .argument(SERVICE_NAME), createJUnitParserTask()
-                                        .description("Resultparser")
-                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                        .enabled(true), 
-                                new InjectVariablesTask().description("Inject git Tag")
-                                        .path("git.tag")
-                                        .namespace("g")
-                                        .scope(InjectVariablesScope.LOCAL), 
-                                new VcsTagTask().description("${bamboo.g.gitTag}")
-                                        .tagName("${bamboo.g.gitTag}")
-                                        .defaultRepository())
-                .dockerConfiguration(
-                        new DockerConfiguration()
-                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
+                .stages(new Stage("Default Stage")
+                        .jobs(new Job("Default Job",
+                                new BambooKey("JOB1"))
+                                .tasks(
+                                        new ScriptTask()
+                                                .description("Clean")
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+                                                        "rm -rf ./*"),
+                                        new VcsCheckoutTask()
+                                                .description("Checkout Default Repository")
+                                                .cleanCheckout(true)
+                                                .checkoutItems(new CheckoutItem().defaultRepository()),
+                                        new ScriptTask()
+                                                .description("Build")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                                .argument(SERVICE_NAME),
+                                        createJUnitParserTask()
+                                                .description("Resultparser")
+                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                                .enabled(true),
+                                        new InjectVariablesTask()
+                                                .description("Inject git Tag")
+                                                .path("git.tag")
+                                                .namespace("g")
+                                                .scope(InjectVariablesScope.LOCAL),
+                                        new VcsTagTask()
+                                                .description("${bamboo.g.gitTag}")
+                                                .tagName("${bamboo.g.gitTag}")
+                                                .defaultRepository())
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
                 .linkedRepositories("RED / " + SERVICE_NAME)
+
                 .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
-                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranch()
+                        .delete(new BranchCleanup()
+                                .whenInactiveInRepositoryAfterDays(14))
                         .notificationForCommitters());
     }
 
-
-    public Plan createNightPlan() {
-
-        return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests")
-                .variables(new Variable("maven_add_param", "-Dtest-groups=rules-test"))
-                .stages(new Stage("Default Stage").jobs(
-                        new Job("Default Job", new BambooKey("JOB1")).tasks(
-                                new CleanWorkingDirectoryTask()
-                                        .description("Clean working directory.")
-                                        .enabled(true), 
-                                new VcsCheckoutTask()
-                                        .description("Checkout Default Repository")
-                                        .cleanCheckout(true)
-                                        .checkoutItems(
-                                new CheckoutItem()
-                                        .defaultRepository()),
-                                new ScriptTask()
-                                        .description("Build")
-                                        .location(Location.FILE)
-                                        .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                        .argument(SERVICE_NAME + " verify"), createJUnitParserTask().description("Resultparser")
-                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                        .enabled(true))
-                        .dockerConfiguration(
-                                new DockerConfiguration()
-                                        .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                        .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                        .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters());
-    }
-
-
     public Plan createSecBuild() {
-
-        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
-                                .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository")
-                                .cleanCheckout(true)
-                                .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Sonar")
-                                .location(Location.FILE)
-                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                .argument(SERVICE_NAME))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .dockerRunArguments("--net=host")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
+        return new Plan(
+                project(),
+                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
+                .description("Security Analysis Plan")
+                .stages(new Stage("Default Stage")
+                        .jobs(new Job("Default Job",
+                                new BambooKey("JOB1"))
+                                .tasks(
+                                        new ScriptTask()
+                                                .description("Clean")
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+                                                        "rm -rf ./*"),
+                                        new VcsCheckoutTask()
+                                                .description("Checkout Default Repository")
+                                                .cleanCheckout(true)
+                                                .checkoutItems(new CheckoutItem().defaultRepository()),
+                                        new ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME))
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                                .dockerRunArguments("--net=host")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
                 .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
+                .triggers(
+                        new ScheduledTrigger()
+                                .scheduleOnceDaily(LocalTime.of(23, 00)))
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranchMatching("release.*")
+                        .notificationForCommitters());
     }
-
 }

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

@@ -2,7 +2,6 @@
 set -e
 
 SERVICE_NAME=$1
-MVN_TARGET=${2:-deploy}
 
 if [[ "$bamboo_planRepository_branchName" == "master" ]]
 then
@@ -47,7 +46,7 @@ mvn --no-transfer-progress \
 
 mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
     --no-transfer-progress \
-    clean $MVN_TARGET \
+    clean deploy \
     ${bamboo_maven_add_param} \
     -e \
     -DdeployAtEnd=true \

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

@@ -10,13 +10,9 @@ import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
 public class PlanSpecTest {
     @Test
     public void checkYourPlanOffline() throws PropertiesValidationException {
-
         Plan plan = new PlanSpec().createPlan();
         EntityPropertiesBuilders.build(plan);
 
-        Plan nightPlan = new PlanSpec().createNightPlan();
-        EntityPropertiesBuilders.build(nightPlan);
-
         Plan secPlan = new PlanSpec().createSecBuild();
         EntityPropertiesBuilders.build(secPlan);
     }

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-image-v1/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM red/redaction-service-base-v1:2.0.0
+FROM red/redaction-service-base-v1:1.0.0
 
 ARG PLATFORM_JAR
 

redaction-service-v1/pom.xml

@@ -23,19 +23,20 @@
 
     <properties>
         <pdfbox.version>2.0.24</pdfbox.version>
-        <dsljson.version>1.9.9</dsljson.version>
     </properties>
 
 
     <dependencyManagement>
+
         <dependencies>
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.20.0</version>
+                <version>1.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
@@ -46,7 +47,9 @@
                 <artifactId>pdfbox-tools</artifactId>
                 <version>${pdfbox.version}</version>
             </dependency>
+
         </dependencies>
+
     </dependencyManagement>
 
     <build>
@@ -55,10 +58,12 @@
                 <plugin>
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.9.0.2155</version>
                     </plugin>
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
+                    <version>6.3.1</version>
                     <configuration>
                         <format>ALL</format>
                     </configuration>
@@ -83,5 +88,27 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.8</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,24 +12,15 @@
     <artifactId>redaction-service-api-v1</artifactId>
 
     <properties>
-        <persistence-service.version>1.254.0</persistence-service.version>
+        <persistence-service.version>1.143.0</persistence-service.version>
     </properties>
 
     <dependencies>
-
-        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>${dsljson.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>persistence-service-api-v1</artifactId>
@@ -41,21 +32,5 @@
                 </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,18 +1,16 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.dslplatform.json.CompiledJson;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class ImportedRedactions {

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.*;
@@ -40,7 +41,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 +54,6 @@ public class RedactionLogEntry {
 
     private boolean excluded;
 
-    private String sourceId;
-
     @EqualsAndHashCode.Exclude
     @Builder.Default
     private List<Change> changes = new ArrayList<>();

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,20 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+
+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;
+
 @Data
 @Builder
 @NoArgsConstructor

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,50 +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>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.ahocorasick</groupId>
-            <artifactId>ahocorasick</artifactId>
-            <version>${ahocorasick.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>${javaassist.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>redaction-service-api-v1</artifactId>
@@ -81,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>
@@ -129,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/FloatFrequencyCounter.java

@@ -35,7 +35,9 @@ public class FloatFrequencyCounter {
     public Float getMostPopular() {
         Map.Entry<Float, Integer> mostPopular = null;
         for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
+            if (mostPopular == null) {
+                mostPopular = entry;
+            } else if (entry.getValue() >= mostPopular.getValue()) {
                 mostPopular = entry;
             }
         }
@@ -59,7 +61,9 @@ public class FloatFrequencyCounter {
     public Float getHighest() {
         Float highest = null;
         for (Float value : countPerValue.keySet()) {
-            if (highest == null || value > highest) {
+            if (highest == null) {
+                highest = value;
+            } else if (value > highest) {
                 highest = value;
             }
         }

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 {
@@ -27,15 +24,11 @@ public class SectionText {
     private boolean isTable;
     private String headline;
 
-    @Builder.Default
     private List<SectionArea> sectionAreas = new ArrayList<>();
-    @Builder.Default
     private Set<Image> images = new HashSet<>();
-    @Builder.Default
+
     private List<TextBlock> textBlocks = new ArrayList<>();
-    @Builder.Default
     private Map<String, CellValue> tabularData = new HashMap<>();
-    @Builder.Default
     private List<Integer> cellStarts = new ArrayList<>();
 
 
@@ -45,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/SimplifiedSectionText.java

@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import com.dslplatform.json.CompiledJson;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@CompiledJson
-@NoArgsConstructor
-@AllArgsConstructor
-public class SimplifiedSectionText {
-
-    private int sectionNumber;
-    private String text;
-
-}

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

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

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

@@ -37,7 +37,9 @@ public class StringFrequencyCounter {
 
         Map.Entry<String, Integer> mostPopular = null;
         for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
+            if (mostPopular == null) {
+                mostPopular = entry;
+            } else if (entry.getValue() > mostPopular.getValue()) {
                 mostPopular = entry;
             }
         }

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,36 +15,21 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 @Data
-@CompiledJson
 @NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {
 
     @Builder.Default
     private List<TextPositionSequence> sequences = new ArrayList<>();
-
-    @JsonIgnore
     private int rotation;
 
-    @JsonIgnore
     private String mostPopularWordFont;
-
-    @JsonIgnore
     private String mostPopularWordStyle;
-
-    @JsonIgnore
     private float mostPopularWordFontSize;
-
-    @JsonIgnore
     private float mostPopularWordHeight;
-
-    @JsonIgnore
     private float mostPopularWordSpaceWidth;
 
-    @JsonIgnore
     private float highestFontSize;
 
-
-    @JsonIgnore
     private String classification;
 
 
@@ -138,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/client/MockMultipartFile.java

@@ -1,16 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
 public class MockMultipartFile implements MultipartFile {
 
     private final String name;
@@ -82,13 +82,13 @@ public class MockMultipartFile implements MultipartFile {
     }
 
 
-    public byte[] getBytes() {
+    public byte[] getBytes() throws IOException {
 
         return this.content;
     }
 
 
-    public InputStream getInputStream() {
+    public InputStream getInputStream() throws IOException {
 
         return new ByteArrayInputStream(this.content);
     }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/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>> data = new HashMap<>();
 
 }

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

@@ -1,34 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.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 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.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.*;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.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;
 
 @Slf4j
 @RestController
@@ -37,12 +33,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) {
 
@@ -124,18 +150,46 @@ public class RedactionController implements RedactionResource {
     @Override
     public void testRules(@RequestBody String rules) {
 
-        try {
-            droolsExecutionService.testRules(rules);
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
-        }
+        droolsExecutionService.testRules(rules);
     }
 
 
     @Override
     public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
 
-        return redactionLogMergeService.provideRedactionLog(redactionRequest);
+        log.debug("Requested preview for: {}", 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());
+        var merged = redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages(), redactionRequest.getTypes(), redactionRequest.getColors());
+
+        merged.getRedactionLogEntry().removeIf(e -> e.isFalsePositive() && !redactionRequest.isIncludeFalsePositives());
+
+        return merged;
     }
 
 
@@ -143,14 +197,19 @@ public class RedactionController implements RedactionResource {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
             document.save(byteArrayOutputStream);
-            return RedactionResult.builder().document(byteArrayOutputStream.toByteArray()).numberOfPages(numberOfPages).build();
+            return RedactionResult.builder()
+                    .document(byteArrayOutputStream.toByteArray())
+                    .numberOfPages(numberOfPages)
+                    .build();
         }
 
     }
 
 
     @Override
-    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId, @PathVariable("fileId") String fileId, @RequestBody ManualRedactions manualRedactions) {
+    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
+                                               @PathVariable("fileId") String fileId,
+                                               @RequestBody ManualRedactions manualRedactions) {
 
         var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
         log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());

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/LegacyPDFStreamEngine.java

@@ -301,24 +301,12 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
             nextY -= pageSize.getLowerLeftY();
         }
 
-        // This is a hack for unicode letter with 2 chars e.g. RA see unicodeProblem.pdf
-        if(unicodeMapping.length() == 2){
-            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
-                    pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
-                    Math.abs(dyDisplay), dxDisplay,
-                    Math.abs(spaceWidthDisplay), Character.toString(unicodeMapping.charAt(0)), new int[] { code }, font,
-                    fontSize,
-                    (int)(fontSize * textMatrix.getScalingFactorX())));
-            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
-                    pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
-                    Math.abs(dyDisplay), dxDisplay,
-                    Math.abs(spaceWidthDisplay), Character.toString(unicodeMapping.charAt(1)), new int[] { code }, font,
-                    fontSize,
-                    (int)(fontSize * textMatrix.getScalingFactorX())));
-        } else {
-
-            processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(), pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY, Math.abs(dyDisplay), dxDisplay, Math.abs(spaceWidthDisplay), unicodeMapping, new int[]{code}, font, fontSize, (int) (fontSize * textMatrix.getScalingFactorX())));
-        }
+        processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
+                pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
+                Math.abs(dyDisplay), dxDisplay,
+                Math.abs(spaceWidthDisplay), unicodeMapping, new int[] { code }, font,
+                fontSize,
+                (int)(fontSize * textMatrix.getScalingFactorX())));
     }
 
     /**

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) {
@@ -187,7 +244,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 rulings.addAll(path);
             }
         } catch (UnsupportedOperationException e) {
-            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
+            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
                     .getColorSpace()
                     .getName() + " or " + getGraphicsState().getNonStrokingColor()
                     .getColorSpace()
@@ -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,55 +1,39 @@
 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;
-    private float[] position;
-
-    @JsonIgnore
     private int rotation;
-
-    @JsonIgnore
+    private float y;
     private float pageHeight;
-
-    @JsonIgnore
     private float pageWidth;
-
     private String unicode;
-
-    @JsonIgnore
+    private float XDirAdj;
+    private float YDirAdj;
+    private float width;
+    private float heightDir;
+    private float widthDirAdj;
     private float dir;
 
     // not used in reanalysis
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     private float widthOfSpace;
 
     // not used in reanalysis
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     private float fontSizeInPt;
 
     // not used in reanalysis
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     private String fontName;
 
 
@@ -63,37 +47,8 @@ public class RedTextPosition {
 
         pos.setTextMatrix(textPosition.getTextMatrix().toString());
 
-        var position = new float[4];
-
-        position[0] = textPosition.getXDirAdj();
-        position[1] = textPosition.getYDirAdj();
-        position[2] = textPosition.getWidthDirAdj();
-        position[3] = textPosition.getHeightDir();
-
-        pos.setPosition(position);
         return pos;
     }
 
 
-    @JsonIgnore
-    public float getXDirAdj(){
-        return position[0];
-    }
-
-    @JsonIgnore
-    public float getYDirAdj(){
-        return position[1];
-    }
-
-    @JsonIgnore
-    public float getWidthDirAdj(){
-        return position[2];
-    }
-
-    @JsonIgnore
-    public float getHeightDir(){
-        return position[3];
-    }
-
-
 }

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

@@ -1,62 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.util.Objects;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-import lombok.Getter;
-
-@Getter
-public enum TextDirection {
-    ZERO(0f),
-    QUARTER_CIRCLE(90f),
-    HALF_CIRCLE(180f),
-    THREE_QUARTER_CIRCLE(270f);
-
-    public static final String VALUE_STRING_SUFFIX = "°";
-
-    @JsonValue
-    private final float degrees;
-    private final float radians;
-
-    TextDirection(float degreeValue) {
-        degrees = degreeValue;
-        radians = (float) Math.toRadians(degreeValue);
-    }
-
-    @Override
-    public String toString() {
-        return degrees + VALUE_STRING_SUFFIX;
-    }
-
-    @com.dslplatform.json.JsonValue
-    public float jsonValue() {
-        return getDegrees();
-    }
-
-    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
-    public static TextDirection fromDegrees(float degrees) {
-
-        for (var dir : TextDirection.values()) {
-            if (degrees == dir.degrees) {
-                return dir;
-            }
-        }
-
-        throw new IllegalArgumentException(String.format("A value of %f is not supported by TextDirection", degrees));
-    }
-
-    public static TextDirection fromString(String degreesAsString) {
-
-        Objects.requireNonNull(degreesAsString, "Cannot construct a text direction from a null value");
-
-        String value = degreesAsString.strip();
-
-        if (degreesAsString.endsWith(VALUE_STRING_SUFFIX)) {
-            value = degreesAsString.replace(VALUE_STRING_SUFFIX + "$", "");
-        }
-
-        return fromDegrees(Float.parseFloat(value));
-    }
-}

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

@@ -1,44 +1,31 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;
 
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.apache.pdfbox.text.TextPosition;
 
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Data
-@Builder
-@CompiledJson
 @NoArgsConstructor
-@AllArgsConstructor
 @JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {
 
-    public static final int HEIGHT_PADDING = 2;
     private int page;
     private List<RedTextPosition> textPositions = new ArrayList<>();
 
-    private TextDirection dir;
-    private int rotation;
-    private float pageHeight;
-    private float pageWidth;
+    private float x1;
+    private float x2;
 
 
     public TextPositionSequence(int page) {
@@ -47,7 +34,7 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    public TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
+    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
 
         var textPositionSequence = new TextPositionSequence();
         textPositionSequence.textPositions = textPositions;
@@ -61,10 +48,6 @@ public class TextPositionSequence implements CharSequence {
 
         this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
         this.page = page;
-        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
-        this.rotation = textPositions.get(0).getRotation();
-        this.pageHeight = textPositions.get(0).getPageHeight();
-        this.pageWidth = textPositions.get(0).getPageWidth();
     }
 
 
@@ -95,15 +78,7 @@ public class TextPositionSequence implements CharSequence {
     @Override
     public TextPositionSequence subSequence(int start, int end) {
 
-        var textPositionSequence = new TextPositionSequence();
-        textPositionSequence.textPositions = textPositions.subList(start, end);
-        textPositionSequence.page = page;
-        textPositionSequence.dir = dir;
-        textPositionSequence.rotation = rotation;
-        textPositionSequence.pageHeight = pageHeight;
-        textPositionSequence.pageWidth = pageWidth;
-
-        return textPositionSequence;
+        return fromData(textPositions.subList(start, end), page);
     }
 
 
@@ -124,34 +99,22 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    public void add(TextPositionSequence textPositionSequence, RedTextPosition textPosition) {
+    public void add(RedTextPosition textPosition) {
 
         this.textPositions.add(textPosition);
-        this.page = textPositionSequence.getPage();
-        this.dir = textPositionSequence.getDir();
-        this.rotation = textPositionSequence.getRotation();
-        this.pageHeight = textPositionSequence.getPageHeight();
-        this.pageWidth = textPositionSequence.getPageWidth();
     }
 
 
     public void add(TextPosition textPosition) {
 
         this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
-
-        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
-        this.rotation = textPositions.get(0).getRotation();
-        this.pageHeight = textPositions.get(0).getPageHeight();
-        this.pageWidth = textPositions.get(0).getPageWidth();
-
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getX1() {
 
-        if (rotation == 90) {
+        if (textPositions.get(0).getRotation() == 90) {
             return textPositions.get(0).getYDirAdj() - getTextHeight();
         } else {
             return textPositions.get(0).getXDirAdj();
@@ -160,59 +123,61 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getX2() {
 
-        if (rotation == 90) {
+        if (textPositions.get(0).getRotation() == 90) {
             return textPositions.get(0).getYDirAdj();
         } else {
-            return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING;
+            return textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
         }
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getRotationAdjustedY() {
 
-        return textPositions.get(0).getYDirAdj();
+        return textPositions.get(0).getY();
+    }
+
+
+    @JsonIgnore
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getY1() {
 
-        if (rotation == 90) {
+        if (textPositions.get(0).getRotation() == 90) {
             return textPositions.get(0).getXDirAdj();
         } else {
-            return pageHeight - textPositions.get(0).getYDirAdj();
+            return textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj();
         }
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getY2() {
 
-        if (rotation == 90) {
-            return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() - HEIGHT_PADDING;
+        if (textPositions.get(0).getRotation() == 90) {
+            return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() - 2;
         } else {
-            return pageHeight - textPositions.get(0).getYDirAdj() + getTextHeight();
+            return textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() + getTextHeight();
         }
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getTextHeight() {
 
-        return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
+        return textPositions.get(0).getHeightDir() + 2;
     }
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getHeight() {
 
         return getY2() - getY1();
@@ -220,7 +185,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getWidth() {
 
         return getX2() - getX1();
@@ -228,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", "");
@@ -236,7 +199,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public String getFontStyle() {
 
         String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
@@ -255,7 +217,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getFontSize() {
 
         return textPositions.get(0).getFontSizeInPt();
@@ -263,7 +224,6 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
     public float getSpaceWidth() {
 
         return textPositions.get(0).getWidthOfSpace();
@@ -271,40 +231,85 @@ public class TextPositionSequence implements CharSequence {
 
 
     @JsonIgnore
-    @JsonAttribute(ignore = true)
-    @SneakyThrows
+    public int getRotation() {
+
+        return textPositions.get(0).getRotation();
+    }
+
+
+    @JsonIgnore
     public Rectangle getRectangle() {
 
-        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, this, rotation, dir);
+        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, toString(), textPositions.get(0).getRotation(), textPositions.get(0).getDir());
 
-        float textHeight = getTextHeight();
+        float height = getTextHeight();
 
-        RedTextPosition firstTextPos = textPositions.get(0);
-        RedTextPosition lastTextPos = textPositions.get(textPositions.size() - 1);
+        float posXInit = getX1();
+        float posXEnd;
+        float posYInit;
+        float posYEnd;
 
-        Point2D bottomLeft = new Point2D.Double(firstTextPos.getXDirAdj(), firstTextPos.getYDirAdj() - HEIGHT_PADDING);
-        Point2D topRight = new Point2D.Double(lastTextPos.getXDirAdj() + lastTextPos.getWidthDirAdj(), lastTextPos.getYDirAdj() + textHeight + HEIGHT_PADDING);
+        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
+            posXEnd = textPositions.get(0).getYDirAdj() + 2;
+            posYInit = getY1();
+            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = posYInit + 1;
+            posXInit = textPositions.get(0).getXDirAdj();
+            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
+            posXInit = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
+            posYInit = getX1();
+            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
+                    .getWidthDirAdj() - 3;
+            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;
 
-        AffineTransform transform = new AffineTransform();
-        if (dir == TextDirection.ZERO || dir == TextDirection.HALF_CIRCLE) {
-            transform.rotate(dir.getRadians(), pageWidth / 2f, pageHeight / 2f);
-            transform.translate(0f, pageHeight + textHeight);
-            transform.scale(1., -1.);
-        } else if (dir == TextDirection.QUARTER_CIRCLE) {
-            transform.rotate(dir.getRadians(), pageWidth / 2f, pageWidth / 2f);
-            transform.translate(0f, pageWidth + textHeight);
-            transform.scale(1., -1.);
         } else {
-            transform.rotate(dir.getRadians(), pageHeight / 2f, pageHeight / 2f);
-            transform.translate(0f, pageWidth + textHeight);
-            transform.scale(1., -1.);
+            posXEnd = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
         }
 
-        bottomLeft = transform.transform(bottomLeft, null);
-        topRight = transform.transform(topRight, null);
-
-        return new Rectangle( //
-                new Point((float) bottomLeft.getX(), (float) bottomLeft.getY()), (float) (topRight.getX() - bottomLeft.getX()), (float) (topRight.getY() - bottomLeft.getY()), page);
+        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        log.debug("Rectangle: {}", rectangle);
+        return rectangle;
     }
 
 }

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

@@ -1,11 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.queue;
 
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
-
-import 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;
@@ -14,9 +8,13 @@ import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
 
 @Slf4j
 @Service
@@ -57,9 +55,6 @@ public class RedactionMessageReceiver {
                     result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
                     log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
                     break;
-
-                default:
-                    throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
             }
 
             result.setMessageType(analyzeRequest.getMessageType());

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

@@ -54,6 +54,16 @@ public class Dictionary {
     }
 
 
+    public boolean containsValue(String type, String value) {
+
+        return localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getValues(false)
+                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getValues(true)
+                .contains(value);
+    }
+
+
     public boolean isHint(String type) {
 
         DictionaryModel model = localAccessMap.get(type);

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

@@ -23,4 +23,4 @@ public class DictionaryEntries {
     @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,30 @@ 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 Set<DictionaryEntry> entries;
+    private Set<DictionaryEntry> falsePositives;
+    private Set<DictionaryEntry> falseRecommendations;
+    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 Set<String> getFalsePositiveValues() {
+        return falsePositives.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors
+                .toSet());
     }
 
-    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 Set<String> getFalseRecommendationValues() {
+        return falseRecommendations.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors
+                .toSet());
     }
 
-    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

@@ -2,7 +2,9 @@ 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.*;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -10,16 +12,12 @@ import java.util.List;
 import java.util.Set;
 
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity implements ReasonHolder {
 
     private String word;
     private String type;
     private boolean redaction;
-    private boolean falsePositive;
     private String redactionReason;
     private String legalBasis;
     private List<EntityPositionSequence> positionSequences = new ArrayList<>();
@@ -52,10 +50,6 @@ public class Entity implements ReasonHolder {
 
     private EntityType entityType;
 
-    private boolean resized;
-
-    private boolean skipRemoveEntitiesContainedInLarger;
-
 
     public Entity(String word, String type, boolean redaction, String redactionReason,
                   List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,

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/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,21 +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;
-    @NonNull
     private boolean hasTransparency;
+
     @NonNull
     private int page;
 
+    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
+        this.image = image;
+        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
+        this.page = page;
+        this.hasTransparency = hasTransparency;
+    }
+
 }

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,27 +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.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-
-import lombok.Getter;
+import java.util.regex.Pattern;
 
 public class SearchableText {
 
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    private transient String stringRepresentation;
-    @Getter
     private final List<TextPositionSequence> sequences = new ArrayList<>();
 
 
@@ -99,13 +88,13 @@ 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)
                             .charAt(j, caseInsensitive) != ' ') {
-                        partMatch.add(searchSpace.get(i),searchSpace.get(i).textPositionAt(j));
+                        partMatch.add(searchSpace.get(i).textPositionAt(j));
                         if (!(j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
                                 .charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) {
                             counter++;
@@ -116,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)
@@ -186,20 +175,20 @@ public class SearchableText {
     }
 
 
+    private boolean isSeparator(char c) {
+
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+    }
+
+
     @Override
     public String toString() {
+
         return buildString(sequences);
     }
 
-    public String asString() {
-        if (stringRepresentation == null) {
-            stringRepresentation = buildString(sequences);
-        }
-        return stringRepresentation;
-    }
 
-
-    public static String buildString(List<TextPositionSequence> sequences) {
+    public String buildString(List<TextPositionSequence> sequences) {
 
         StringBuilder sb = new StringBuilder();
 
@@ -223,36 +212,6 @@ public class SearchableText {
     }
 
 
-    public String getAsStringWithLinebreaksSorted() {
-
-        return getAsStringWithLinebreaksSorted(this.sequences);
-    }
-
-
-    public String getAsStringWithLinebreaksSorted(List<TextPositionSequence> sequences) {
-        var sorted = sequences.stream().sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getXDirAdj())).sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getYDirAdj())).sorted(Comparator.comparing(a -> a.getPage())).collect(Collectors.toList());
-
-        StringBuilder sb = new StringBuilder();
-
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sorted) {
-
-            if (previous != null) {
-                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
-                }
-            }
-            sb.append(word.toString());
-            previous = word;
-        }
-        return sb.append("\n").toString();
-    }
-
-
-
-
     public String getAsStringWithLinebreaks() {
 
         StringBuilder sb = new StringBuilder();

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

@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -11,6 +9,5 @@ public class SectionSearchableTextPair {
 
     private Section section;
     private SearchableText searchableText;
-    private List<Integer> cellStarts;
 
 }

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,15 +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 ImageMetadata {
 
     private Classification classification;
     private Position position;
     private Geometry geometry;
     private Filters filters;
-    private boolean alpha;
 }

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

@@ -1,16 +1,14 @@
 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 com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
 @Data
-@CompiledJson
 public class ImageServiceResponse {
 
     private String dossierId;
@@ -18,14 +16,6 @@ public class ImageServiceResponse {
 
     @JsonProperty(value = "imageMetadata")
     @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
     private List<ImageMetadata> data = new ArrayList<>();
 
-    private List<ImageMetadata> dataCV = new ArrayList<>();
-
-    @JsonProperty(value = "imageMetadata")
-    @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    public void setData(List<ImageMetadata> data) {this.data = data;}
-
 }

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

@@ -2,12 +2,10 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -21,42 +19,34 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.entity
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionLogLegalBasis;
 import com.iqser.red.service.redaction.v1.model.SectionArea;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.SimplifiedSectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.SimplifiedText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -81,7 +71,6 @@ public class AnalyzeService {
     private final ImportedRedactionService importedRedactionService;
 
 
-    @Timed("redactmanager_analyzeDocumentStructure")
     public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
@@ -103,7 +92,6 @@ public class AnalyzeService {
         }
 
         List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
-
         sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
 
         Text text = new Text(pageCount, sectionTexts);
@@ -116,9 +104,8 @@ public class AnalyzeService {
                         .map(SectionArea::getPage)
                         .collect(Collectors.toSet()), sectionText.getSectionAreas())));
 
-        log.info("Store text, simplified text and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        log.info("Store text and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SIMPLIFIED_TEXT, convert(text));
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc.getSectionGrid());
 
         return AnalyzeResult.builder()
@@ -131,7 +118,6 @@ public class AnalyzeService {
     }
 
 
-    @Timed("redactmanager_reanalyze")
     @SneakyThrows
     public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
 
@@ -158,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()
@@ -171,7 +157,6 @@ public class AnalyzeService {
         Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
 
         PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
-
         var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
 
         var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false);
@@ -185,7 +170,6 @@ public class AnalyzeService {
     }
 
 
-    @Timed("redactmanager_analyze")
     public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
@@ -195,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());
@@ -207,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()));
 
@@ -218,7 +202,6 @@ public class AnalyzeService {
     }
 
 
-    @Timed("redactmanager_findSectionsToReanalyse")
     private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
                                                  Text text, AnalyzeRequest analyzeRequest) {
 
@@ -236,13 +219,9 @@ public class AnalyzeService {
             }
         }
 
-
-        var dictionaryIncrementsSearch = new SearchImplementation(dictionaryIncrement.getValues().stream()
-                .map(DictionaryIncrementValue::getValue).collect(Collectors.toList()), true);
-
         for (SectionText sectionText : text.getSectionTexts()) {
 
-            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrementsSearch)) {
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
                 sectionsToReanalyse.add(sectionText.getSectionNumber());
             }
 
@@ -292,9 +271,7 @@ public class AnalyzeService {
             return new HashSet<>();
         }
 
-        return Stream.concat(manualRedactions.getResizeRedactions()
-                .stream()
-                .map(ManualResizeRedaction::getAnnotationId), Stream.concat(manualRedactions.getLegalBasisChanges()
+        return Stream.concat(manualRedactions.getLegalBasisChanges()
                 .stream()
                 .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
                 .stream()
@@ -302,12 +279,9 @@ public class AnalyzeService {
                 .stream()
                 .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions()
                 .stream()
-                .map(ManualForceRedaction::getAnnotationId))))).collect(Collectors.toSet());
+                .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) {
 
@@ -336,17 +310,4 @@ public class AnalyzeService {
         }
     }
 
-
-    private SimplifiedText convert(Text text) {
-
-        List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
-        int numberOfPages = 0;
-
-        if (text != null) {
-            numberOfPages = text.getNumberOfPages();
-            text.getSectionTexts().stream().filter(Objects::nonNull).forEach(st -> sectionTexts.add(new SimplifiedSectionText(st.getSectionNumber(), st.getText())));
-        }
-        return SimplifiedText.builder().numberOfPages(numberOfPages).sectionTexts(sectionTexts).build();
-    }
-
 }

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

@@ -1,16 +1,9 @@
-package com.iqser.red.service.redaction.v1.server.annotate;
+package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.io.MemoryUsageSetting;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.*;
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -23,61 +16,18 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.CellRectangle;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogComment;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.SectionRectangle;
-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 java.awt.*;
+import java.io.IOException;
+import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @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);
 
@@ -128,7 +78,7 @@ public class AnnotationService {
         annotation.setRectangle(pdRectangle);
         annotation.setQuadPoints(toQuadPoints(rectangles, mediaBox, cropBox));
         if (!redactionLogEntry.isHint()) {
-            annotation.setContents(redactionLogEntry.getValue() + " " +createAnnotationContent(redactionLogEntry));
+            annotation.setContents(createAnnotationContent(redactionLogEntry));
         }
         annotation.setTitlePopup(redactionLogEntry.getId());
         annotation.setAnnotationName(redactionLogEntry.getId());
@@ -136,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

@@ -6,7 +6,6 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import feign.FeignException;
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -18,19 +17,18 @@ import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class DictionaryService {
 
-    private static final String DEFAULT_COLOR = "#cccccc";
     private final DictionaryClient dictionaryClient;
 
     private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
     private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
 
 
-    @Timed("redactmanager_updateDictionary")
     public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {
 
         log.info("Updating dictionary data for dossierTemplate {} and dossier {}", dossierTemplateId, dossierId);
@@ -46,16 +44,11 @@ public class DictionaryService {
             updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, getVersion(dossierDictionary), dossierId);
         }
 
-        return DictionaryVersion.builder()
-                .dossierTemplateVersion(dossierTemplateDictionaryVersion)
-                .dossierVersion(dossierDictionaryVersion)
-                .build();
+        return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
     }
 
 
-    @Timed("redactmanager_getDictionaryIncrements")
-    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion,
-                                                       String dossierId) {
+    public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {
 
         DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);
 
@@ -109,78 +102,63 @@ 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, false)
+                    : dictionaryClient.getAllTypesForDossier(dossierId, false);
             if (CollectionUtils.isNotEmpty(typeResponse)) {
 
-                List<DictionaryModel> dictionary = typeResponse.stream().map(t -> {
+                List<DictionaryModel> dictionary = typeResponse
+                        .stream()
+                        .map(t -> {
 
-                    Optional<DictionaryModel> oldModel;
-                    if (dossierId == null) {
-                        var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
-                        oldModel = representation != null ? representation.getDictionary()
-                                .stream()
-                                .filter(f -> f.getType().equals(t.getType()))
-                                .findAny() : Optional.empty();
-                    } else {
-                        var representation = dictionariesByDossier.get(dossierId);
-                        oldModel = representation != null ? representation.getDictionary()
-                                .stream()
-                                .filter(f -> f.getType().equals(t.getType()))
-                                .findAny() : Optional.empty();
-                    }
+                            Optional<DictionaryModel> oldModel;
+                            if (dossierId == null) {
+                                var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
+                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
+                            } else {
+                                var representation = dictionariesByDossier.get(dossierId);
+                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
+                            }
 
-                    Set<DictionaryEntry> entries = new HashSet<>();
-                    Set<DictionaryEntry> falsePositives = new HashSet<>();
-                    Set<DictionaryEntry> falseRecommendations = new HashSet<>();
+                            Set<DictionaryEntry> entries = new HashSet<>();
+                            Set<DictionaryEntry> falsePositives = new HashSet<>();
+                            Set<DictionaryEntry> falseRecommendations = new HashSet<>();
 
-                    DictionaryEntries newEntries = getEntries(t.getId(), currentVersion);
+                            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());
+                            var newValues = newEntries.getEntries().stream().map(v -> v.getValue()).collect(Collectors.toSet());
+                            var newFalsePositivesValues = newEntries.getFalsePositives().stream().map(v -> v.getValue()).collect(Collectors.toSet());
+                            var newFalseRecommendationsValues = newEntries.getFalseRecommendations().stream().map(v -> v.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 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());
 
-                    // Add Increments
-                    entries.addAll(newEntries.getEntries());
-                    falsePositives.addAll(newEntries.getFalsePositives());
-                    falseRecommendations.addAll(newEntries.getFalseRecommendations());
-
-                    return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t.isHint(), entries, falsePositives, falseRecommendations, dossierId != null);
-                }).sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList());
+                            return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                    .isHint(), entries, falsePositives, falseRecommendations, new HashSet<>(), dossierId != null);
+                        })
+                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
+                        .collect(Collectors.toList());
 
                 dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));
 
                 Colors colors = dictionaryClient.getColors(dossierTemplateId);
 
-                dictionaryRepresentation.setDefaultColor(convertColor(DEFAULT_COLOR));
-                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAddColor()));
-                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemoveColor()));
-                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getSkippedColor()));
+                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
+                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
+                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
+                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
                 dictionaryRepresentation.setDossierTemplateId(dossierTemplateId);
                 dictionaryRepresentation.setDictionaryVersion(version);
                 dictionaryRepresentation.setDictionary(dictionary);
@@ -211,7 +189,6 @@ public class DictionaryService {
             falsePositives.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
             falseRecommendations.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
         }
-        log.info("Dictionary update returned {} entries {} falsePositives and {} falseRecommendations for type {}", entries.size(), falsePositives.size(), falseRecommendations.size(), type.getType());
         return new DictionaryEntries(entries, falsePositives, falseRecommendations);
     }
 
@@ -223,6 +200,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);
@@ -243,7 +230,6 @@ public class DictionaryService {
     }
 
 
-    @Timed("redactmanager_getDeepCopyDictionary")
     public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {
 
         List<DictionaryModel> copy = new ArrayList<>();
@@ -263,12 +249,13 @@ public class DictionaryService {
             dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
         }
 
-        return new Dictionary(copy.stream()
-                .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
-                .collect(Collectors.toList()), DictionaryVersion.builder()
-                .dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion())
-                .dossierVersion(dossierDictionaryVersion)
-                .build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+    }
+
+
+    public float[] getRequestRemoveColor(String dossierTemplateId) {
+
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
     }
 
 
@@ -278,13 +265,16 @@ public class DictionaryService {
     }
 
 
-    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {
+    public float[] getRequestAddColor(String dossierTemplateId) {
 
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+    }
+
+    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {
         if (dictionaryRepresentation == null) {
             return null;
         } else {
             return dictionaryRepresentation.getDictionaryVersion();
         }
     }
-
 }

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

@@ -3,8 +3,6 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
@@ -43,7 +41,6 @@ public class DroolsExecutionService {
     }
 
 
-    @Timed("redactmanager_executeRules")
     public Section executeRules(KieContainer kieContainer, Section section) {
 
         KieSession kieSession = kieContainer.newKieSession();

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

@@ -1,7 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
@@ -9,21 +21,22 @@ import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import io.micrometer.core.annotation.Timed;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Slf4j
 @Service
@@ -63,7 +76,8 @@ public class EntityRedactionService {
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         for (SectionText reanalysisSection : reanalysisSections) {
 
-            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts(), analyzeRequest.getManualRedactions());
+            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
+                    .getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts());
 
             if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                 surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary, reanalysisSection
@@ -74,24 +88,16 @@ public class EntityRedactionService {
 
             if (!local && analyzeRequest.getManualRedactions() != null) {
 
-                var approvedForceRedactions = analyzeRequest.getManualRedactions()
-                        .getForceRedactions()
-                        .stream()
+                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
                         .filter(fr -> fr.getStatus() == AnnotationStatus.APPROVED)
                         .filter(fr -> fr.getRequestDate() != null)
                         .collect(Collectors.toList());
                 // only approved id removals, that haven't been forced back afterwards
-                var idsToRemove = analyzeRequest.getManualRedactions()
-                        .getIdsToRemove()
-                        .stream()
+                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
                         .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
                         .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream()
-                                .noneMatch(forceRedact -> forceRedact.getAnnotationId()
-                                        .equals(idr.getAnnotationId()) && forceRedact.getRequestDate()
-                                        .isAfter(idr.getRequestDate())))
-                        .map(IdRemoval::getAnnotationId)
-                        .collect(Collectors.toSet());
+                        .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) {
@@ -118,13 +124,12 @@ public class EntityRedactionService {
                 }));
             }
 
-            log.debug("Section {}, Images: {}", reanalysisSection.getSectionNumber(), reanalysisSection.getImages());
-
             sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                     .isLocal(false)
                     .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream.concat(entities.getEntities()
-                                    .stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber()).stream())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
                             .collect(Collectors.toSet()) : entities.getEntities())
                     .nerEntities(entities.getNerEntities())
                     .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
@@ -135,27 +140,14 @@ public class EntityRedactionService {
                     .searchableText(reanalysisSection.getSearchableText())
                     .dictionary(dictionary)
                     .images(reanalysisSection.getImages())
-                    .sectionAreas(reanalysisSection.getSectionAreas())
                     .fileAttributes(analyzeRequest.getFileAttributes())
-                    .manualRedactions(analyzeRequest.getManualRedactions())
-                    .build(), reanalysisSection.getSearchableText(), reanalysisSection.getCellStarts()));
-
+                    .build(), reanalysisSection.getSearchableText()));
         }
 
         Set<Entity> entities = new HashSet<>();
         sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
             Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
             EntitySearchUtils.removeEntitiesContainedInLarger(analysedSection.getEntities());
-
-            var entriesWithoutSurroundingText = analysedSection.getEntities().stream().filter(e -> e.getTextAfter() == null && e.getTextBefore() == null).collect(Collectors.toSet());
-
-            if (sectionSearchableTextPair.getCellStarts() != null && !sectionSearchableTextPair.getCellStarts()
-                    .isEmpty()) {
-                surroundingWordsService.addSurroundingText(entriesWithoutSurroundingText, sectionSearchableTextPair.getSearchableText(), dictionary, sectionSearchableTextPair.getCellStarts());
-            } else {
-                surroundingWordsService.addSurroundingText(entriesWithoutSurroundingText, sectionSearchableTextPair.getSearchableText(), dictionary);
-            }
-
             entities.addAll(analysedSection.getEntities());
 
             if (!local) {
@@ -164,7 +156,6 @@ public class EntityRedactionService {
                 }
                 addLocalValuesToDictionary(analysedSection, dictionary);
             }
-
         });
 
         return entities;
@@ -183,7 +174,11 @@ public class EntityRedactionService {
 
             for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
                 entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry.getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity.getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity.getReferences(), entity.getEntityType()));
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity
+                                .getReferences(), entity.getEntityType()));
             }
         }
         return entitiesPerPage;
@@ -204,40 +199,40 @@ public class EntityRedactionService {
 
     private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {
 
-        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
 
-            if (dictionary.getLocalAccessMap().get(key) == null) {
-                log.warn("Dictionary {} is null", key);
-            }
+                    if (dictionary.getLocalAccessMap().get(key) == 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);
+                });
+        });
     }
 
 
-    @Timed("redactmanager_findEntities")
     private Entities findEntities(SearchableText searchableText, String headline, int sectionNumber,
                                   Dictionary dictionary, boolean local, NerEntities nerEntities,
-                                  List<Integer> cellStarts, ManualRedactions manualRedactions) {
+                                  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.findEntities(lowercaseInputString, model.getValues(local), model, headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false, local ? true : false));
+            } else {
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.findEntities(searchableString, model.getValues(local), model, headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false, local ? true : false));
+            }
         }
 
         Set<Entity> nerFound = new HashSet<>();
@@ -245,8 +240,7 @@ public class EntityRedactionService {
             nerFound.addAll(getNerValues(sectionNumber, nerEntities, cellStarts, headline));
         }
 
-        var cleared = EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        return new Entities(cleared.stream().filter(e -> !e.isFalsePositive()).collect(Collectors.toSet()), nerFound);
+        return new Entities(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary), nerFound);
     }
 
 

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

@@ -7,12 +7,10 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.model.ImportedRedaction;
 import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -25,7 +23,6 @@ public class ImportedRedactionService {
     private final RedactionStorageService redactionStorageService;
 
 
-    @Timed("redactmanager_processImportedRedactions")
     public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId, String dossierId, String fileId,
                                                              List<RedactionLogEntry> redactionLogEntries,
                                                              boolean addImportedRedactions) {
@@ -71,13 +68,12 @@ public class ImportedRedactionService {
     private void addIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
 
         for (Rectangle rectangle : redactionLogEntry.getPositions()) {
-            var normalizedRectangle = normalize(rectangle);
             if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
                 var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPage());
                 for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
                     for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
-                        if (rectOverlap(normalizedRectangle, normalize(importedRedactionPosition))) {
-                            if (redactionLogEntry.getImportedRedactionIntersections() == null) {
+                        if (intersects(importedRedactionPosition, rectangle)) {
+                            if(redactionLogEntry.getImportedRedactionIntersections() == null){
                                 redactionLogEntry.setImportedRedactionIntersections(new HashSet<>());
                             }
                             redactionLogEntry.getImportedRedactionIntersections().add(importedRedaction.getId());
@@ -89,57 +85,15 @@ public class ImportedRedactionService {
     }
 
 
-    boolean valueInRange(float value, float min, float max) {
+    private boolean intersects(Rectangle importedPosition, Rectangle redactionLogPosition) {
 
-        return round(value) >= round(min) && round(value) <= round(max);
-    }
-
-
-    boolean rectOverlap(Rectangle a, Rectangle b) {
-
-        boolean xOverlap = valueInRange(a.getTopLeft().getX(), b.getTopLeft().getX(), b.getTopLeft()
-                .getX() + b.getWidth()) || valueInRange(b.getTopLeft().getX(), a.getTopLeft().getX(), a.getTopLeft()
-                .getX() + a.getWidth());
-
-        boolean yOverlap = valueInRange(a.getTopLeft().getY(), b.getTopLeft().getY(), b.getTopLeft()
-                .getY() + b.getHeight()) || valueInRange(b.getTopLeft().getY(), a.getTopLeft().getY(), a.getTopLeft()
-                .getY() + a.getHeight());
-
-        return xOverlap && yOverlap;
-    }
-
-
-    private Rectangle normalize(Rectangle rectangle) {
-
-        Rectangle r = new Rectangle();
-        Point p = new Point();
-
-        if (rectangle.getWidth() < 0) {
-            p.setX(rectangle.getTopLeft().getX() + rectangle.getWidth());
-            r.setWidth(Math.abs(rectangle.getWidth()));
-        } else {
-            p.setX(rectangle.getTopLeft().getX());
-            r.setWidth(rectangle.getWidth());
-        }
-
-        if (rectangle.getHeight() < 0) {
-            p.setY(rectangle.getTopLeft().getY() + rectangle.getHeight());
-            r.setHeight(Math.abs(rectangle.getHeight()));
-        } else {
-            p.setY(rectangle.getTopLeft().getY());
-            r.setHeight(rectangle.getHeight());
-        }
-
-        r.setTopLeft(p);
-        r.setPage(rectangle.getPage());
-        return r;
-    }
-
-
-    private float round(float value) {
-
-        double d = Math.pow(10, 0);
-        return (float) (Math.round(value * d) / d);
+        return redactionLogPosition.getTopLeft()
+                .getX() + redactionLogPosition.getWidth() > importedPosition.getTopLeft()
+                .getX() && redactionLogPosition.getTopLeft()
+                .getY() + redactionLogPosition.getHeight() > importedPosition.getTopLeft()
+                .getY() && redactionLogPosition.getTopLeft().getX() < importedPosition.getTopLeft()
+                .getX() + importedPosition.getWidth() && redactionLogPosition.getTopLeft()
+                .getY() < importedPosition.getTopLeft().getY() + importedPosition.getHeight();
     }
 
 

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.model.SectionArea;
@@ -20,11 +21,8 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -36,16 +34,17 @@ public class ManualRedactionSurroundingTextService {
     private final RedactionStorageService redactionStorageService;
     private final SurroundingWordsService surroundingWordsService;
 
-    @Timed("redactmanager_SurroundingTextAnalysis")
+
     public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
 
         long startTime = System.currentTimeMillis();
         Text text = redactionStorageService.getText(dossierId, fileId);
         List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
+        List<ManualResizeRedaction> processedResizeRedactions = new ArrayList<>();
 
         for (SectionText sectionText : text.getSectionTexts()) {
 
-            if (manualRedactions.getEntriesToAdd().isEmpty()) {
+            if (manualRedactions.getEntriesToAdd().isEmpty() && manualRedactions.getResizeRedactions().isEmpty()) {
                 break;
             }
 
@@ -62,10 +61,23 @@ public class ManualRedactionSurroundingTextService {
                         addItty.remove();
                     }
                 }
+
+                var resizeItty = manualRedactions.getResizeRedactions().iterator();
+                while (resizeItty.hasNext()) {
+                    var manualResizeRedaction = resizeItty.next();
+                    if (manualResizeRedaction.getValue() != null && sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
+                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction.getPositions());
+                        manualResizeRedaction.setTextBefore(surroundingText.getLeft());
+                        manualResizeRedaction.setTextAfter(surroundingText.getRight());
+                        processedResizeRedactions.add(manualResizeRedaction);
+                        resizeItty.remove();
+                    }
+                }
             }
         }
 
         manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
+        manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
 
         return AnalyzeResult.builder()
                 .dossierId(dossierId)
@@ -79,8 +91,8 @@ public class ManualRedactionSurroundingTextService {
     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> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null, null);
+        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, false, EntityType.ENTITY);
+        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/RedactionChangeLogService.java

@@ -2,8 +2,6 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -20,7 +18,6 @@ public class RedactionChangeLogService {
     private final RedactionStorageService redactionStorageService;
 
 
-    @Timed("redactmanager_computeChanges")
     public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog, int analysisNumber) {
 
         long start = System.currentTimeMillis();

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

@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+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;
@@ -20,7 +22,6 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -32,7 +33,6 @@ public class RedactionLogCreatorService {
     private final DictionaryService dictionaryService;
 
 
-    @Timed("redactmanager_createRedactionLog")
     public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
                                                       String dossierTemplateId) {
 
@@ -112,7 +112,10 @@ public class RedactionLogCreatorService {
                 redactionLogEntry.setId(entityPositionSequence.getId());
 
                 if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
-                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences());
+                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
+                            .stream()
+                            .flatMap(seq -> seq.getTextPositions().stream())
+                            .collect(Collectors.toList()), page);
 
                     redactionLogEntry.getPositions().addAll(rectanglesPerLine);
 
@@ -129,43 +132,38 @@ public class RedactionLogCreatorService {
     }
 
 
-    private List<Rectangle> getRectanglesPerLine(List<TextPositionSequence> textPositionSequences) {
+    private List<Rectangle> getRectanglesPerLine(List<RedTextPosition> textPositions, int page) {
 
         List<Rectangle> rectangles = new ArrayList<>();
+        if (textPositions.size() == 1) {
+            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
+        } else {
+            float x = textPositions.get(0).getXDirAdj();
+            float y = textPositions.get(0).getYDirAdj();
+            float width = textPositions.get(0).getWidthDirAdj();
+            float height = textPositions.get(0).getHeightDir();
+            int startIndex = 0;
 
-        if (textPositionSequences.size() == 1) {
-            rectangles.add(textPositionSequences.get(0).getRectangle());
-            return rectangles;
-        }
+            for (int i = 1; i < textPositions.size(); i++) {
+                float xDirAdj = textPositions.get(i).getXDirAdj();
+                float yDirAdj = textPositions.get(i).getYDirAdj();
+                float widthDir = textPositions.get(i).getWidthDirAdj();
+                float heightDir = textPositions.get(i).getHeightDir();
 
-        TextPositionSequence combinedSequence = new TextPositionSequence();
-        for (int i = 0; i < textPositionSequences.size(); i++) {
-
-            if(combinedSequence.getTextPositions().isEmpty()){
-                combinedSequence = textPositionSequences.get(i);
-                continue;
+                if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
+                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
+                            .getRectangle());
+                    y = yDirAdj;
+                    width = widthDir;
+                    height = heightDir;
+                    startIndex = i;
+                }
+                x = xDirAdj;
             }
-
-            float lastSeqX = textPositionSequences.get(i - 1).getTextPositions().get(textPositionSequences.get(i - 1).getTextPositions().size() - 1).getXDirAdj();
-            float lastSeqY = textPositionSequences.get(i - 1).getTextPositions().get(textPositionSequences.get(i - 1).getTextPositions().size() - 1).getYDirAdj();
-            float lastSeqWidth = textPositionSequences.get(i - 1).getTextPositions().get(textPositionSequences.get(i - 1).getTextPositions().size() - 1).getWidthDirAdj();
-            float lastSeqHeight = textPositionSequences.get(i - 1).getTextPositions().get(textPositionSequences.get(i - 1).getTextPositions().size() - 1).getHeightDir();
-
-            float currentSeqX = textPositionSequences.get(i).getTextPositions().get(0).getXDirAdj();
-            float currentSeqY = textPositionSequences.get(i).getTextPositions().get(0).getYDirAdj();
-            float currentSeqHeight = textPositionSequences.get(i).getTextPositions().get(0).getHeightDir();
-
-            if (isCharInSameLine(lastSeqY, currentSeqY, lastSeqHeight, currentSeqHeight) && isCharClose(lastSeqX, currentSeqX, lastSeqWidth)) {
-                combinedSequence.getTextPositions().addAll(textPositionSequences.get(i).getTextPositions());
-            } else {
-                rectangles.add(combinedSequence.getRectangle());
-                combinedSequence = textPositionSequences.get(i);
+            if (startIndex != textPositions.size()) {
+                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
+                        .getRectangle());
             }
-
-        }
-
-        if(!combinedSequence.getTextPositions().isEmpty()) {
-            rectangles.add(combinedSequence.getRectangle());
         }
 
         return rectangles;
@@ -207,8 +205,7 @@ public class RedactionLogCreatorService {
                 .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))
+                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
                 .section(entity.getHeadline())
                 .sectionNumber(entity.getSectionNumber())
                 .matchedRule(entity.getMatchedRule())

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

@@ -1,108 +1,45 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.awt.Color;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.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.Change;
-import com.iqser.red.service.redaction.v1.model.ChangeType;
-import com.iqser.red.service.redaction.v1.model.ManualChange;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogComment;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import io.micrometer.core.annotation.Timed;
+import com.iqser.red.service.redaction.v1.model.*;
 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;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class RedactionLogMergeService {
 
-    private static final String DELETED_TYPE_COLOR = "#9398a0";
+
     private final SectionTextService sectionTextService;
 
-    private final RedactionStorageService redactionStorageService;
 
-
-    @Timed("redactmanager_getMergedRedactionLog")
-    public RedactionLog provideRedactionLog(RedactionRequest redactionRequest) {
-
-        log.debug("Requested preview for: {}", redactionRequest);
-
-        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-        if (redactionLog == null) {
-            throw new NotFoundException("RedactionLog not present");
-        }
-
-        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
-        if (sectionGrid.getSections().isEmpty()) {
-
-            log.info("SectionGrid does not have headlines set. Computing headlines now!");
-            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
-
-            // enhance section grid with headline data
-            for (var sectionText : text.getSectionTexts()) {
-                sectionGrid.getSections()
-                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
-                                .stream()
-                                .map(SectionArea::getPage)
-                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
-            }
-            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
-        }
-
-        log.debug("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-        var merged = mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages(), redactionRequest.getTypes(), redactionRequest.getColors());
-
-        merged.getRedactionLogEntry().removeIf(e -> e.isFalsePositive() && !redactionRequest.isIncludeFalsePositives());
-
-        return merged;
-    }
-
-
-    private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                               ManualRedactions manualRedactions, Set<Integer> excludedPages,
-                                               List<Type> types, Colors colors) {
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid, ManualRedactions manualRedactions,
+                                              Set<Integer> excludedPages, List<Type> types, Colors colors) {
 
         var skippedImportedRedactions = new HashSet<>();
+
         log.info("Merging Redaction log with manual redactions");
         if (manualRedactions != null) {
 
-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types, redactionLog.getAnalysisNumber());
+
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types);
 
             redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
 
@@ -118,7 +55,7 @@ public class RedactionLogMergeService {
                     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 -> {
@@ -133,12 +70,9 @@ 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")))) {
+                if (!entry.getImportedRedactionIntersections().isEmpty() && (!entry.isImage() || entry.isImage() && !(entry.getType().equals("image") || entry.getType().equals("ocr")))) {
                     return true;
                 }
             }
@@ -203,6 +137,7 @@ public class RedactionLogMergeService {
                 String manualOverrideReason = null;
                 if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
 
+
                     redactionLogEntry.setType(imageRecategorization.getType());
                     redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
 
@@ -219,20 +154,16 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                 }
 
-                if(manualOverrideReason != null) {
-                    redactionLogEntry.setReason(manualOverrideReason);
-                }
+                redactionLogEntry.setReason(manualOverrideReason);
 
-                redactionLogEntry.getManualChanges()
-                        .add(ManualChange.from(imageRecategorization)
-                                .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
-                                .withChange("type", imageRecategorization.getType()));
+                redactionLogEntry.getManualChanges().add(ManualChange.from(imageRecategorization)
+                        .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
+                        .withChange("type", imageRecategorization.getType()));
             }
 
             if (mrw.getItem() instanceof IdRemoval) {
                 var manualRemoval = (IdRemoval) mrw.getItem();
-                if (manualRemoval.getStatus()
-                        .equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
+                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
                     log.debug("Skipping merge for dictionary-modifying entry");
                 } else {
                     String manualOverrideReason = null;
@@ -246,13 +177,11 @@ public class RedactionLogMergeService {
                         redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                     }
 
-                    if(manualOverrideReason != null) {
-                        redactionLogEntry.setReason(manualOverrideReason);
-                    }
+                    redactionLogEntry.setReason(manualOverrideReason);
 
-                    redactionLogEntry.getManualChanges()
-                            .add(ManualChange.from(manualRemoval)
-                                    .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ? ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+                    redactionLogEntry.getManualChanges().add(ManualChange.from(manualRemoval)
+                            .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ?
+                                    ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
                 }
             }
 
@@ -276,10 +205,7 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                 }
 
-                if(manualOverrideReason != null) {
-                    redactionLogEntry.setReason(manualOverrideReason);
-                }
-
+                redactionLogEntry.setReason(manualOverrideReason);
                 var manualChange = ManualChange.from(manualForceRedact)
                         .withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
 
@@ -305,9 +231,7 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                 }
 
-                if(manualOverrideReason != null) {
-                    redactionLogEntry.setReason(manualOverrideReason);
-                }
+                redactionLogEntry.setReason(manualOverrideReason);
 
                 var manualChange = ManualChange.from(manualLegalBasisChange)
                         .withManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
@@ -328,30 +252,21 @@ public class RedactionLogMergeService {
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setValue(manualResizeRedact.getValue());
-
-                    // This is for backwards compatibility, now the text after/before is calculated during reanalysis because we need to find dict entries on positions where entries are resized to smaller.
-                    if (manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
-                        redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                        redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
-                    }
+                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
                 } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
-
-                    // This is for backwards compatibility, now the text after/before is calculated during reanalysis because we need to find dict entries on positions where entries are resized to smaller.
-                    if (manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
-                        redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                        redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
-                    }
+                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
                 }
 
                 redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.getManualChanges()
-                        .add(ManualChange.from(manualResizeRedact)
-                                .withManualRedactionType(ManualRedactionType.RESIZE)
-                                .withChange("value", manualResizeRedact.getValue()));
+                redactionLogEntry.getManualChanges().add(ManualChange.from(manualResizeRedact)
+                        .withManualRedactionType(ManualRedactionType.RESIZE)
+                        .withChange("value", manualResizeRedact.getValue()));
             }
 
         });
@@ -373,17 +288,16 @@ public class RedactionLogMergeService {
 
 
     public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, Colors colors,
-                                                       List<Type> types, int analysisNumber) {
+                                                       Map<String, List<Comment>> comments, Colors colors, List<Type> types) {
 
         List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
 
         for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
 
             if (shouldCreateManualEntry(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), colors, types, analysisNumber);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), colors, types);
                 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());
 
@@ -397,14 +311,6 @@ public class RedactionLogMergeService {
     }
 
 
-    private List<RedactionLogComment> convert(List<Comment> comments) {
-
-        return comments == null ? null : comments.stream()
-                .map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(), c.getFileId(), c.getDate(), c.getSoftDeletedTime()))
-                .collect(Collectors.toList());
-    }
-
-
     private List<Rectangle> convertPositions(
             List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
 
@@ -416,13 +322,13 @@ public class RedactionLogMergeService {
 
     @SuppressWarnings("PMD.UselessParentheses")
     private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) {
-
-        return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary()) || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary()) && manualRedactionEntry.getProcessedDate() == null);
+        return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary())
+                || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDictionary()) && manualRedactionEntry.getProcessedDate() == null);
     }
 
 
     private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      Colors colors, List<Type> types, int analysisNumber) {
+                                                      Colors colors, List<Type> types) {
 
         var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
 
@@ -439,7 +345,6 @@ public class RedactionLogMergeService {
                 .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                 .legalBasis(manualRedactionEntry.getLegalBasis())
                 .value(manualRedactionEntry.getValue())
-                .sourceId(manualRedactionEntry.getSourceId())
                 .section(manualRedactionEntry.getSection())
                 .type(manualRedactionEntry.getType())
                 .redacted(true)
@@ -447,19 +352,18 @@ public class RedactionLogMergeService {
                 .sectionNumber(-1)
                 .rectangle(manualRedactionEntry.isRectangle())
                 .manualChanges(changeList)
-                .changes(List.of(new Change(analysisNumber + 1, ChangeType.ADDED, manualRedactionEntry.getRequestDate())))
                 .build();
     }
 
 
-    private float[] getColor(String type, Colors colors, boolean requested, boolean isRedaction, boolean skipped,
-                             List<Type> types) {
+    private float[] getColor(String type, Colors colors, boolean requested, boolean isRedaction,
+                             boolean skipped, List<Type> types) {
 
         if (requested) {
-            return convertColor(colors.getRequestRemoveColor());
+            return convertColor(colors.getRequestRemove());
         }
         if (skipped || !isRedaction && !isHint(types, type)) {
-            return convertColor(colors.getSkippedColor());
+            return convertColor(colors.getNotRedacted());
         }
         return getColor(types, type);
     }
@@ -468,9 +372,9 @@ public class RedactionLogMergeService {
     private float[] getColorForManualAdd(String type, Colors colors, AnnotationStatus status, List<Type> types) {
 
         if (status.equals(AnnotationStatus.REQUESTED)) {
-            return convertColor(colors.getRequestAddColor());
+            return convertColor(colors.getRequestAdd());
         } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return convertColor(colors.getSkippedColor());
+            return convertColor(colors.getNotRedacted());
         }
         return getColor(types, type);
     }
@@ -484,8 +388,7 @@ public class RedactionLogMergeService {
             return convertColor(foundAndNotDeletedType.get().getHexColor());
         }
         Optional<Type> firstDeletedType = matchingTypes.stream().findFirst();
-        return firstDeletedType.map(value -> convertColor(value.getHexColor()))
-                .orElseGet(() -> convertColor(DELETED_TYPE_COLOR));
+        return firstDeletedType.map(value -> convertColor(value.getHexColor())).orElseGet(() -> convertColor("#9398a0"));
     }
 
 
@@ -507,15 +410,11 @@ public class RedactionLogMergeService {
         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;
     }
 

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

@@ -1,35 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.SectionArea;
-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.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.classification.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -44,10 +28,15 @@ public class SectionTextBuilderService {
 
             List<Table> tables = paragraph.getTables();
             for (Table table : tables) {
-                sectionTexts.addAll(processTablePerRow(table, sectionNumber));
+                if (table.getColCount() == 2) {
+                    sectionTexts.add(processTableAsOneText(table, sectionNumber));
+                } else {
+                    sectionTexts.addAll(processTablePerRow(table, sectionNumber));
+                }
                 sectionNumber.incrementAndGet();
             }
-            sectionTexts.add(processText(paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph.getHeadline(), sectionNumber, paragraph.getImages()));
+            sectionTexts.add(processText(paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph.getHeadline(), sectionNumber, paragraph
+                    .getImages()));
             sectionNumber.incrementAndGet();
         }
 
@@ -73,50 +62,58 @@ public class SectionTextBuilderService {
     private List<SectionText> processTablePerRow(Table table, AtomicInteger sectionNumber) {
 
         List<SectionText> sectionTexts = new ArrayList<>();
-        boolean hasHeader = hasTableHeader(table);
-
         for (List<Cell> row : table.getRows()) {
-
-            List<TextBlock> textBlocks = new ArrayList<>();
-            List<SectionArea> areas = new ArrayList<>();
+            SearchableText searchableRow = new SearchableText();
             Map<String, CellValue> tabularData = new HashMap<>();
-            List<Integer> startOffsets = new ArrayList<>();
+            int start = 0;
+            List<Integer> cellStarts = new ArrayList<>();
+            SectionText sectionText = new SectionText();
+            for (Cell cell : row) {
 
-            int startOffset = 0;
-            for (int cellNum = 0; cellNum < row.size(); cellNum++) {
-
-                Cell cell = row.get(cellNum);
                 if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
                     continue;
                 }
 
-                SectionArea sectionArea = getSectionArea(cell);
-                areas.add(sectionArea);
+                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                        .get(0)
+                        .getSequences()
+                        .get(0)
+                        .getPage());
+                sectionText.getSectionAreas().add(sectionArea);
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+
+                int cellStart = start;
 
                 if (!cell.isHeaderCell()) {
-                    String headerName = getHeaderName(hasHeader, cell, table.getRows().get(0), row.size(), cellNum);
-                    if (headerName != null) {
+                    cell.getHeaderCells().forEach(headerCell -> {
+                        StringBuilder headerBuilder = new StringBuilder();
+                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                        String headerName = headerBuilder.toString()
+                                .replaceAll("\n", "")
+                                .replaceAll(" ", "")
+                                .replaceAll("-", "");
                         sectionArea.setHeader(headerName);
-                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), startOffset));
-                    }
+                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                    });
                 }
 
-                textBlocks.addAll(cell.getTextBlocks());
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    // TODO avoid cell overlap merging.
+                    searchableRow.addAll(textBlock.getSequences());
+                }
+                cellStarts.add(cellStart);
+                start = start + cell.toString().trim().length() + 1;
 
-                startOffsets.add(startOffset);
-                startOffset = startOffset + cell.toString().trim().length() + 1;
             }
 
-            sectionTexts.add(SectionText.builder()
-                    .text(getRowText(textBlocks))
-                    .headline(table.getHeadline())
-                    .sectionNumber(sectionNumber.intValue())
-                    .isTable(true)
-                    .tabularData(tabularData)
-                    .cellStarts(startOffsets)
-                    .textBlocks(textBlocks)
-                    .sectionAreas(areas)
-                    .build());
+            sectionText.setText(searchableRow.toString());
+            sectionText.setHeadline(table.getHeadline());
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(true);
+            sectionText.setTabularData(tabularData);
+            sectionText.setCellStarts(cellStarts);
+            sectionTexts.add(sectionText);
 
             sectionNumber.incrementAndGet();
         }
@@ -125,61 +122,66 @@ public class SectionTextBuilderService {
     }
 
 
-    public String getRowText(List<TextBlock> rowTextBlocks) {
+    private SectionText processTableAsOneText(Table table, AtomicInteger sectionNumber) {
 
-        return SearchableText.buildString(rowTextBlocks.stream().map(textBlock -> textBlock.getSequences()).flatMap(List::stream).collect(Collectors.toList()));
-    }
+        SearchableText entireTableText = new SearchableText();
+        SectionText sectionText = new SectionText();
+        int start = 0;
+        List<Integer> cellStarts = new ArrayList<>();
+        for (List<Cell> row : table.getRows()) {
 
 
-    private boolean hasTableHeader(Table table) {
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
 
-        return table.getRows().stream().anyMatch(row -> row.stream().anyMatch(cell -> !cell.isHeaderCell() && !cell.getHeaderCells().isEmpty()));
-    }
+                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                        .get(0)
+                        .getSequences()
+                        .get(0)
+                        .getPage());
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+                sectionText.getSectionAreas().add(sectionArea);
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
 
 
-    private SectionArea getSectionArea(Cell cell) {
+                cellStarts.add(start);
+                start = start + cell.toString().trim().length() + 1;
+            }
 
-        return new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell.getWidth(), (float) cell.getHeight(),
-                cell.getTextBlocks().get(0).getSequences().get(0).getPage(), null);
-    }
-
-
-    private String getHeaderName(boolean hasHeader, Cell currentCell, List<Cell> firstRow, int currentRowSize, int cellNum) {
-
-        if (hasHeader && !currentCell.getHeaderCells().isEmpty()) {
-            return buildHeaderName(currentCell.getHeaderCells().get(currentCell.getHeaderCells().size() - 1));
         }
+        sectionText.setCellStarts(cellStarts);
 
-        if (!hasHeader && currentRowSize == firstRow.size() && currentCell != firstRow.get(cellNum)) {
-            return buildHeaderName(firstRow.get(cellNum));
-        }
-
-        return null;
+        sectionText.setText(entireTableText.toString());
+        sectionText.setHeadline(table.getHeadline());
+        sectionText.setSectionNumber(sectionNumber.intValue());
+        sectionText.setTable(true);
+        return sectionText;
     }
 
 
-    private String buildHeaderName(Cell cell) {
-
-        StringBuilder headerBuilder = new StringBuilder();
-        cell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-        return headerBuilder.toString().replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-    }
-
-
-    private SectionText processText(SearchableText searchableText, List<TextBlock> paragraphTextBlocks, String headline, AtomicInteger sectionNumber, List<PdfImage> images) {
+    private SectionText processText(SearchableText searchableText, List<TextBlock> paragraphTextBlocks, String headline,
+                                    AtomicInteger sectionNumber, List<PdfImage> images) {
 
         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);
+            SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
+                    .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);
-        sectionText.setImages(images.stream().map(image -> convertImage(image, sectionNumber.intValue(), headline)).collect(Collectors.toSet()));
+        sectionText.setImages(images.stream()
+                .map(image -> convertImage(image, sectionNumber.intValue(), headline))
+                .collect(Collectors.toSet()));
         sectionText.setTextBlocks(paragraphTextBlocks);
         return sectionText;
     }
@@ -188,7 +190,9 @@ public class SectionTextBuilderService {
     private Image convertImage(PdfImage pdfImage, int sectionNumber, String headline) {
 
         return Image.builder()
-                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType().name().toLowerCase(Locale.ROOT))
+                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
+                        .name()
+                        .toLowerCase(Locale.ROOT))
                 .position(pdfImage.getPosition())
                 .sectionNumber(sectionNumber)
                 .section(headline)

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

@@ -4,8 +4,6 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -21,7 +19,6 @@ public class SurroundingWordsService {
     private final RedactionServiceSettings redactionServiceSettings;
 
 
-    @Timed("redactmanager_addSurroundingText")
     public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary) {
 
         if (entities.isEmpty()) {
@@ -34,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!");
@@ -42,7 +39,6 @@ public class SurroundingWordsService {
     }
 
 
-    @Timed("redactmanager_addSurroundingText_tables")
     public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary,
                                    List<Integer> cellstarts) {
 
@@ -51,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,60 +1,116 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import 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.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 @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> findEntities(String inputString, Set<String> values, DictionaryModel type, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionary,
+                                    Engine engine, boolean ignoreMinLength, boolean asRecommendation) {
 
-        if (details.getEntityType() == EntityType.RECOMMENDATION) {
-            Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationsSearch(), details.withEntityType(EntityType.FALSE_RECOMMENDATION));
-            markFalsePositives(found, falseRecommendations);
-        } else {
-            Set<Entity> falsePositives = find(inputString, type.getFalsePositiveSearch(), details.withEntityType(EntityType.FALSE_POSITIVE));
-            markFalsePositives(found, falsePositives);
+       Set<Entity> found = find(inputString, values, type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY);
+
+       if(asRecommendation){
+           Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationValues(), type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, EntityType.FALSE_RECOMMENDATION);
+           removeFalsePositives(found, falseRecommendations);
+           found.addAll(falseRecommendations);
+       } else {
+           Set<Entity> falsePositives = find(inputString, type.getFalsePositiveValues(), type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, EntityType.FALSE_POSITIVE);
+           removeFalsePositives(found, falsePositives);
+           found.addAll(falsePositives);
+       }
+
+       return found;
+    }
+
+
+    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionary,
+                                    Engine engine, boolean ignoreMinLength, EntityType entityType) {
+        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, entityType));
+                }
+            } 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()));
 
-        return entities;
-    }
+    private boolean isSeparator(char c) {
 
-    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 == '’';
     }
 
 
-    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary, ManualRedactions manualRedactions) {
+    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
 
         Map<String, List<Entity>> entitiesByWord = new HashMap<>();
 
@@ -69,119 +125,51 @@ public class EntitySearchUtils {
             List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
                     .trim(), dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
 
-            Map<String, List<EntityPositionSequence>> multipartSequenceParts = new HashMap<>();
-            Iterator<EntityPositionSequence> itty = positionSequences.iterator();
-            while (itty.hasNext()){
-                var positionSequence = itty.next();
-                if(positionSequence.getId().contains("-")){
-                    multipartSequenceParts.computeIfAbsent(positionSequence.getId().split("-")[0], (x) -> new ArrayList<>()).add(positionSequence);
-                    itty.remove();
-                }
-            }
-
             for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                 try {
-                    List<EntityPositionSequence> toAdd = new ArrayList<>();
-                    var currentSeq = positionSequences.get(i);
-                    toAdd.add(currentSeq);
-                    if(multipartSequenceParts.containsKey(currentSeq.getId())){
-                        toAdd.addAll(multipartSequenceParts.get(currentSeq.getId()));
-                    }
-                    orderedEntities.get(i).setPositionSequences(toAdd);
-
+                    orderedEntities.get(i).setPositionSequences(List.of(positionSequences.get(i)));
                 } catch (Exception e) {
                     log.warn("Mismatch between EntityPositionSequence and found Entity!");
                 }
             }
         }
 
-        if (manualRedactions != null && manualRedactions.getResizeRedactions() != null && !manualRedactions.getResizeRedactions().isEmpty()) {
-            applyResizeRedactions(entities, manualRedactions);
-        }
-
         removeEntitiesContainedInLarger(entities);
 
         return entities;
     }
 
 
-    private void applyResizeRedactions(Set<Entity> entitiesWithPositions, ManualRedactions manualRedactions) {
 
-        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()) {
-            return;
-        }
-
-        entitiesWithPositions.forEach(e -> e.getPositionSequences()
-                .forEach(pos -> manualRedactions.getResizeRedactions().stream().filter(resize -> resize.getStatus().equals(AnnotationStatus.APPROVED)).forEach(resize -> {
-                    if (resize.getAnnotationId().equals(pos.getId())) {
-                        if (resize.getValue().length() < e.getWord().length() && e.getWord().contains(resize.getValue())) {
-                            int start = e.getWord().indexOf(resize.getValue());
-                            e.setStart(e.getStart() + start);
-                            e.setEnd(e.getStart() + resize.getValue().length());
-                            e.setResized(true);
-                            e.setWord(resize.getValue());
-                        } else if (resize.getValue().length() > e.getWord().length() && resize.getValue().contains(e.getWord())) {
-                            int start = resize.getValue().indexOf(e.getWord());
-                            e.setStart(e.getStart() - start);
-                            e.setEnd(e.getStart() + resize.getValue().length());
-                            e.setResized(true);
-                            e.setWord(resize.getValue());
-                        }
-                    }
-                })));
-
-    }
-
-
-    public void markFalsePositives(Set<Entity> entities, Set<Entity> falsePositives) {
+    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.add(inner);
                 }
             }
         }
-        wordsToRemove.forEach(e -> e.setFalsePositive(true));
-        for (var entity : entities) {
-            if (falsePositives.contains(entity)) {
-                entity.setFalsePositive(true);
-            }
-        }
+        entities.removeAll(wordsToRemove);
+        entities.removeAll(falsePositives);
     }
 
 
+
+
     public void removeEntitiesContainedInLarger(Set<Entity> entities) {
 
         List<Entity> wordsToRemove = new ArrayList<>();
         for (Entity word : entities) {
             for (Entity inner : entities) {
-//                // skip cross-type false positives
-//                if(word.getEntityType() == EntityType.FALSE_POSITIVE && inner.getEntityType() == EntityType.ENTITY && !inner.getType().equals(word.getType())){
-//                    continue;
-//                }
-//                // skip cross-type false reccommendations
-//                if(word.getEntityType() == EntityType.FALSE_RECOMMENDATION && inner.getEntityType() == EntityType.RECOMMENDATION && !inner.getType().equals(word.getType())){
-//                    continue;
-//                }
-
-                if(inner.isSkipRemoveEntitiesContainedInLarger() || word.isSkipRemoveEntitiesContainedInLarger()){
-                    continue;
-                }
-
                 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)) {
                         wordsToRemove.add(word);
-                    } else if (!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
-                            inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
-                        if (inner.isResized()) {
-                            wordsToRemove.add(word);
-                        } else {
-                            wordsToRemove.add(inner);
-                        }
+                    } else {
+                        wordsToRemove.add(inner);
                     }
                 }
             }
@@ -228,7 +216,7 @@ 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();
@@ -238,10 +226,10 @@ public class EntitySearchUtils {
                 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)) {
+                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()) {
+                    if(found.isRedaction()){
                         existing.setRedaction(true);
                     }
                 }
@@ -297,7 +285,7 @@ public class EntitySearchUtils {
         for (Entity toAdd : toBeAdded) {
             if (existing.contains(toAdd)) {
                 Optional<Entity> existingOptional = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
-                if (existingOptional.isEmpty()) {
+                if (!existingOptional.isPresent()) {
                     return;
                 }
                 var existingEntity = existingOptional.get();

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

@@ -27,48 +27,26 @@ public class ImageService {
     private final ObjectMapper objectMapper;
     private final RedactionStorageService redactionStorageService;
 
-
     @SneakyThrows
-    public Map<Integer, List<PdfImage>> convertImages(String dossierId, String fileId) {
+    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 -> {
-            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.isAlpha(), imageMetadata.getPosition()
-                            .getPageNumber()));
-        });
-
-        // Currently This is a copy but, it will be changed later because i don' t think that we should unclassified images.
-        imageServiceResponse.getDataCV().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.isAlpha(), imageMetadata.getPosition()
-                            .getPageNumber()));
+        imageServiceResponse.getData().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()));
         });
 
         return images;
     }
 
 
-    public void findOcr(Page page) {
-
+    public void findOcr(Page page){
         page.getImages().forEach(image -> {
             if (image.getImageType().equals(ImageType.OTHER)) {
                 page.getTextBlocks().forEach(textblock -> {
@@ -81,4 +59,5 @@ public class ImageService {
         });
     }
 
+
 }

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

@@ -26,6 +26,7 @@ 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;
@@ -42,6 +43,8 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class PdfSegmentationService {
 
+    private final static int MAX_PAGES_BEFORE_GC = 250;
+
     private final RulingCleaningService rulingCleaningService;
     private final TableExtractionService tableExtractionService;
     private final BlockificationService blockificationService;
@@ -57,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);
@@ -74,12 +78,15 @@ public class PdfSegmentationService {
                 Document document = new Document();
                 List<Page> pages = new ArrayList<>();
 
-                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(67108864L));
-                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);
@@ -100,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);
@@ -128,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");
                 }
 
@@ -145,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,9 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.storage;
 
+import java.io.IOException;
 import java.io.InputStream;
 
+import org.springframework.core.io.InputStreamResource;
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
@@ -14,7 +17,6 @@ import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
 
-import io.micrometer.core.annotation.Timed;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -25,8 +27,10 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RedactionStorageService {
 
+    private final ObjectMapper objectMapper;
     private final StorageService storageService;
 
+
     @SneakyThrows
     public InputStream getStoredObject(String storageId) {
 
@@ -35,74 +39,92 @@ public class RedactionStorageService {
 
 
     @SneakyThrows
-    public void storeObject(String dossierId, String fileId, FileType fileType, InputStream inputStream) {
-
-        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), inputStream);
-    }
-
-
-    @SneakyThrows
-    @Timed("redactmanager_storeObject")
     public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
-        storageService.storeJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), any);
+
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
     }
 
-    @Timed("redactmanager_getImportedRedactions")
+
     public ImportedRedactions getImportedRedactions(String dossierId, String fileId) {
 
+        InputStreamResource inputStreamResource;
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMPORTED_REDACTIONS), ImportedRedactions.class);
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMPORTED_REDACTIONS));
         } catch (StorageObjectDoesNotExist e) {
             log.debug("Imported redactions not available.");
             return null;
         }
+
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), ImportedRedactions.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not imported redactions", e);
+        }
     }
 
 
-    @Timed("redactmanager_getRedactionLog")
     public RedactionLog getRedactionLog(String dossierId, String fileId) {
 
+        InputStreamResource inputStreamResource;
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG),RedactionLog.class);
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.REDACTION_LOG));
         } catch (StorageObjectDoesNotExist e) {
             log.debug("Text not available.");
             return null;
         }
 
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert RedactionLog", e);
+        }
     }
 
 
-    @Timed("redactmanager_getText")
     public Text getText(String dossierId, String fileId) {
 
+        InputStreamResource inputStreamResource;
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT),Text.class);
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.TEXT));
         } catch (StorageObjectDoesNotExist e) {
             log.debug("Text not available.");
             return null;
         }
+
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), Text.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert Text", e);
+        }
     }
 
 
-    @Timed("redactmanager_getNerEntities")
     public NerEntities getNerEntities(String dossierId, String fileId) {
 
+        InputStreamResource inputStreamResource;
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES), NerEntities.class);
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES));
         } catch (StorageObjectDoesNotExist e) {
             throw new NotFoundException("NER Entities are not available.");
         }
+
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert NER Entities", e);
+        }
     }
 
 
-
-    @Timed("redactmanager_getSectionGrid")
     public SectionGrid getSectionGrid(String dossierId, String fileId) {
 
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID),SectionGrid.class);
+            var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
+            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
         } catch (StorageObjectDoesNotExist e) {
             throw new NotFoundException("Section Grid is not available.");
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert RedactionLog", 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;
@@ -13,20 +13,13 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public abstract class AbstractTextContainer {
 
-    @JsonIgnore
     protected float minX;
-    @JsonIgnore
     protected float maxX;
-    @JsonIgnore
     protected float minY;
-    @JsonIgnore
     protected float maxY;
-    @JsonIgnore
     protected String classification;
-    @JsonIgnore
     protected int page;
 
-    @JsonIgnore
     private Orientation orientation = Orientation.NONE;
 
     public abstract String getText();
@@ -40,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/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", "#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

@@ -1,30 +1,24 @@
 package com.iqser.red.service.redaction.v1.server;
 
+import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
+import com.iqser.red.storage.commons.service.S3StorageService;
+import com.iqser.red.storage.commons.service.StorageService;
+import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
+import org.springframework.core.io.InputStreamResource;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
-import org.apache.commons.io.IOUtils;
-import org.springframework.core.io.InputStreamResource;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.commons.jackson.ObjectMapperFactory;
-import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
-import com.iqser.red.storage.commons.service.StorageService;
-
-import lombok.SneakyThrows;
-
-public class FileSystemBackedStorageService implements StorageService {
+public class FileSystemBackedStorageService extends S3StorageService {
 
     private final Map<String, File> dataMap = new HashMap<>();
 
     public FileSystemBackedStorageService() {
+        super(null, null);
     }
 
     @SneakyThrows
@@ -39,66 +33,16 @@ 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() {
-
-    }
-
-    @Override
     @SneakyThrows
-    public <T> void storeJSONObject(String objectId, T any) {
-        File tempFile = File.createTempFile("test", ".tmp");
-        getMapper().writeValue(new FileOutputStream(tempFile), any);
-        dataMap.put(objectId, tempFile);
-    }
-
-    private ObjectMapper getMapper() {
-
-        return ObjectMapperFactory.create();
-    }
-
     @Override
-    @SneakyThrows
-    public <T> T readJSONObject(String objectId, Class<T> clazz) {
-        if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) {
-            throw new StorageObjectDoesNotExist("Stored object not found");
-        }
-        return getMapper().readValue(new FileInputStream(dataMap.get(objectId)), clazz);
-    }
-
-    public List<String> listPaths() {
-        return new ArrayList<>(dataMap.keySet());
-    }
-
-
-    public List<String> listFilePaths() {
-        return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList());
-    }
-
-
-    @Override
-    @SneakyThrows
-    public void storeObject(String objectId, InputStream stream) {
+    public void storeObject(String objectId, byte[] data) {
         File tempFile = File.createTempFile("test", ".tmp");
 
-        try (var fileOutputStream = new FileOutputStream(tempFile)) {
-            IOUtils.copy(stream, fileOutputStream);
-        }
+        IOUtils.write(data, new FileOutputStream(tempFile));
 
         dataMap.put(objectId, tempFile);
     }
 
-
     public void clearStorage() {
         this.dataMap.forEach((k, v) -> {
             v.delete();

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;
@@ -31,6 +28,7 @@ import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -41,7 +39,6 @@ import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
 import org.kie.api.builder.KieModule;
 import org.kie.api.runtime.KieContainer;
-import org.mockito.stubbing.Answer;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -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;
 
@@ -91,14 +87,10 @@ public class RedactionIntegrationTest {
     private static final String DOSSIER_REDACTIONS = "dossier_redactions";
     private static final String IMPORTED_REDACTION = "imported_redaction";
     private static final String PII = "PII";
-    private static final String ROTATE_SIMPLE = "RotateSimple";
 
     @Autowired
     private RedactionController redactionController;
 
-    @Autowired
-    private AnnotationService annotationService;
-
     @Autowired
     private AnalyzeService analyzeService;
 
@@ -217,36 +209,35 @@ public class RedactionIntegrationTest {
     }
 
 
-    private void mockDictionaryCalls(Long version) {
+    private void mockDictionaryCalls(Long version){
 
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(TEST_METHOD, false));
-        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(PURITY, false));
-        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(IMAGE, false));
-        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(OCR, false));
-        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(FORMULA, false));
-        when(dictionaryClient.getDictionaryForType(ROTATE_SIMPLE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(ROTATE_SIMPLE, false));
-        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(DOSSIER_REDACTIONS, true));
-        when(dictionaryClient.getDictionaryForType(IMPORTED_REDACTION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).then((Answer<Type>) invocation -> getDictionaryResponse(IMPORTED_REDACTION, true));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PII, false));
+        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMAGE, false));
+        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(OCR, false));
+        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(LOGO, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
+        when(dictionaryClient.getDictionaryForType(IMPORTED_REDACTION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMPORTED_REDACTION, true));
 
     }
 
-
     @Test
     public void test270Rotated() {
 
         AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
+        MemoryStats.printMemoryStats();
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
         assertThat(result).isNotNull();
@@ -258,6 +249,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();
@@ -287,7 +279,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());
@@ -330,36 +322,6 @@ public class RedactionIntegrationTest {
     }
 
 
-
-    @Test
-    public void titleExtraction() throws IOException {
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/RSS/32 - Emamectin Benzoate Technical - Acute Oral Toxicity - Mouse.pdf");
-        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        var text = redactionStorageService.getText(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-
-    }
-
-
-
-
     @Test
     @Ignore
     @SneakyThrows
@@ -526,12 +488,14 @@ public class RedactionIntegrationTest {
         deleted.add("David Chubb");
         deleted.add("mouse");
 
+
         reanlysisVersions.put("mouse", 3L);
 
         when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);
 
         when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
+
         start = System.currentTimeMillis();
 
         ManualRedactions manualRedactions = new ManualRedactions();
@@ -552,7 +516,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());
@@ -616,7 +580,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());
@@ -634,7 +598,8 @@ public class RedactionIntegrationTest {
         String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
 
         ClassPathResource responseJson = new ClassPathResource("files/crafted_document.NER_ENTITIES.json");
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.NER_ENTITIES), responseJson.getInputStream());
+        var bytes = IOUtils.toByteArray(responseJson.getInputStream());
+        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.NER_ENTITIES), bytes);
 
         long start = System.currentTimeMillis();
         ClassPathResource pdfFileResource = new ClassPathResource(fileName);
@@ -701,6 +666,7 @@ public class RedactionIntegrationTest {
 
         when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
 
+
         start = System.currentTimeMillis();
 
         ManualRedactions manualRedactions = new ManualRedactions();
@@ -721,7 +687,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());
@@ -746,71 +712,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 {
 
@@ -821,171 +722,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .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 testUnicodeProblem() throws IOException {
-
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/new/unicodeProblem.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .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 testRotations() throws IOException {
-
-        System.out.println("testTableRedaction");
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/new/RotateTestFile.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .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 testRotationsSimple() throws IOException {
-        loadOnlyDictionaryForSimpleFile();
-        mockDictionaryCalls(null);
-        mockDictionaryCalls(0L);
-
-        System.out.println("testTableRedaction");
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/new/RotateTestFileSimple.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/AnnotatedSimple.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-        long end = System.currentTimeMillis();
-
-        System.out.println("duration: " + (end - start));
-        System.out.println("numberOfPages: " + result.getNumberOfPages());
-    }
-
-
-    @Test
-    public void testTableHeader() throws IOException {
-
-        System.out.println("testTableHeader");
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/Minimal Examples/NoHeaderTable.pdf");
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .build());
-
-        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
-            fileOutputStream.write(annotateResponse.getDocument());
-        }
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-        assertThat(redactionLog.getRedactionLogEntry().size()).isEqualTo(5);
-
-        long end = System.currentTimeMillis();
-
-        System.out.println("duration: " + (end - start));
-        System.out.println("numberOfPages: " + result.getNumberOfPages());
-    }
-
-
-
-    @Test
-    public void testFindDictionaryEntryInResizedEntryPosition() throws IOException {
-
-        System.out.println("testResizeDictFound");
-
-        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);
-
-        long start = System.currentTimeMillis();
-
-        AnalyzeRequest request = prepareStorage("files/new/S157.pdf");
-
-        ManualRedactions manualRedactions = new ManualRedactions();
-
-
-        manualRedactions.getResizeRedactions()
-                .add(ManualResizeRedaction.builder()
-                        .annotationId("ca2b437e2480a4b5966cb8386020d454")
-                        .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))
-                        .value("Bera P")
-                        .positions(List.of(new Rectangle(382.12485f, 235.94246f, 8.768621f, -21.632504f, 1)))
-                        .textBefore("")
-                        .textAfter("")
-                        .build());
-
-        request.setManualRedactions(manualRedactions);
-
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        AnalyzeResult result = analyzeService.analyze(request);
-
-        var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .manualRedactions(manualRedactions)
-                .colors(colors)
-                .types(types)
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1075,7 +812,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());
@@ -1094,7 +831,7 @@ public class RedactionIntegrationTest {
     public void classificationTest() throws IOException {
 
         System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/RSS/01 - CGA100251 - Acute Oral Toxicity (Up and Down Procedure) - Rat (1).pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
 
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
 
@@ -1209,7 +946,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());
@@ -1341,7 +1078,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)
@@ -1365,7 +1102,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());
@@ -1442,7 +1179,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)
@@ -1564,15 +1301,6 @@ public class RedactionIntegrationTest {
 
     }
 
-    private void loadOnlyDictionaryForSimpleFile() {
-        dictionary.clear();
-        dictionary.computeIfAbsent(ROTATE_SIMPLE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/RotateTestFileSimple.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-    }
-
 
     private static String loadFromClassPath(String path) {
 
@@ -1630,8 +1358,7 @@ public class RedactionIntegrationTest {
         typeColorMap.put(LOGO, "#ffe187");
         typeColorMap.put(FORMULA, "#ffe187");
         typeColorMap.put(SIGNATURE, "#ffe187");
-        typeColorMap.put(IMPORTED_REDACTION, "#fcfbe6");
-        typeColorMap.put(ROTATE_SIMPLE, "#66ccff");
+        typeColorMap.put(IMPORTED_REDACTION, "#32a852");
 
         hintTypeMap.put(VERTEBRATE, true);
         hintTypeMap.put(ADDRESS, false);
@@ -1652,7 +1379,6 @@ public class RedactionIntegrationTest {
         hintTypeMap.put(SIGNATURE, false);
         hintTypeMap.put(DOSSIER_REDACTIONS, false);
         hintTypeMap.put(IMPORTED_REDACTION, false);
-        hintTypeMap.put(ROTATE_SIMPLE, false);
 
         caseInSensitiveMap.put(VERTEBRATE, true);
         caseInSensitiveMap.put(ADDRESS, false);
@@ -1673,7 +1399,6 @@ public class RedactionIntegrationTest {
         caseInSensitiveMap.put(FORMULA, true);
         caseInSensitiveMap.put(DOSSIER_REDACTIONS, false);
         caseInSensitiveMap.put(IMPORTED_REDACTION, false);
-        caseInSensitiveMap.put(ROTATE_SIMPLE, true);
 
         recommendationTypeMap.put(VERTEBRATE, false);
         recommendationTypeMap.put(ADDRESS, false);
@@ -1694,7 +1419,6 @@ public class RedactionIntegrationTest {
         recommendationTypeMap.put(LOGO, false);
         recommendationTypeMap.put(DOSSIER_REDACTIONS, false);
         recommendationTypeMap.put(IMPORTED_REDACTION, false);
-        recommendationTypeMap.put(ROTATE_SIMPLE, false);
 
         rankTypeMap.put(PURITY, 155);
         rankTypeMap.put(PII, 150);
@@ -1715,11 +1439,11 @@ public class RedactionIntegrationTest {
         rankTypeMap.put(FORMULA, 26);
         rankTypeMap.put(DOSSIER_REDACTIONS, 200);
         rankTypeMap.put(IMPORTED_REDACTION, 200);
-        rankTypeMap.put(ROTATE_SIMPLE, 150);
 
-        colors.setSkippedColor("#cccccc");
-        colors.setRequestAddColor("#04b093");
-        colors.setRequestRemoveColor("#04b093");
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
     }
 
 
@@ -1727,7 +1451,8 @@ public class RedactionIntegrationTest {
     private void loadNerForTest() {
 
         ClassPathResource responseJson = new ClassPathResource("files/ner_response.json");
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.NER_ENTITIES), responseJson.getInputStream());
+        var bytes = IOUtils.toByteArray(responseJson.getInputStream());
+        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.NER_ENTITIES), bytes);
     }
 
 
@@ -1765,6 +1490,7 @@ public class RedactionIntegrationTest {
                 .build();
     }
 
+
     private String cleanDictionaryEntry(String entry) {
 
         return TextNormalizationUtilities.removeHyphenLineBreaks(entry).replaceAll("\\n", " ");
@@ -1772,8 +1498,6 @@ public class RedactionIntegrationTest {
 
 
     private List<DictionaryEntry> toDictionaryEntry(List<String> entries) {
-        if (entries == null)
-            entries = Collections.emptyList();
 
         List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
         entries.forEach(entry -> {
@@ -1791,49 +1515,36 @@ public class RedactionIntegrationTest {
     public void testImportedRedactions() throws IOException {
 
         String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
-        ClassPathResource pdfFileResource = new ClassPathResource("files/ImportedRedactions/RotateTestFile_without_highlights.pdf");
-        ClassPathResource importedRedactions = new ClassPathResource("files/ImportedRedactions/RotateTestFile_without_highlights.IMPORTED_REDACTIONS.json");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/ImportedRedactions/ImportedRedactions.pdf");
+        ClassPathResource importedRedactions = new ClassPathResource("files/ImportedRedactions/ImportedRedactions.json");
 
         AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.IMPORTED_REDACTIONS), importedRedactions.getInputStream());
+        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.IMPORTED_REDACTIONS), IOUtils.toByteArray(importedRedactions.getInputStream()));
 
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         AnalyzeResult result = analyzeService.analyze(request);
 
         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());
 
-        redactionLog.getRedactionLogEntry().forEach(entry -> {
-            if (entry.getValue() == null) {
-                return;
-            }
-            if (entry.getValue().equals("David")) {
-                assertThat(entry.getImportedRedactionIntersections()).hasSize(1);
-            }
-            if (entry.getValue().equals("annotation")) {
-                assertThat(entry.getImportedRedactionIntersections()).isEmpty();
-            }
-        });
-
         try (FileOutputStream fileOutputStream = new FileOutputStream(outputFileName)) {
             fileOutputStream.write(annotateResponse.getDocument());
         }
     }
 
-
     @Test
     public void testExpandByPrefixRegEx() throws IOException {
 
-        assertThat(dictionary.get(AUTHOR)).contains("Robinson");
-        assertThat(dictionary.get(AUTHOR)).doesNotContain("Mrs. Robinson");
-        assertThat(dictionary.get(AUTHOR)).contains("Bojangles");
-        assertThat(dictionary.get(AUTHOR)).doesNotContain("Mr. Bojangles");
-        assertThat(dictionary.get(AUTHOR)).contains("Tambourine Man");
-        assertThat(dictionary.get(AUTHOR)).doesNotContain("Mr. Tambourine Man");
+        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";
@@ -1844,7 +1555,7 @@ public class RedactionIntegrationTest {
         analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
         analyzeService.analyze(request);
 
-        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1864,7 +1575,6 @@ public class RedactionIntegrationTest {
         assertThat(values).contains("Mr. Tambourine Man");
     }
 
-
     @SneakyThrows
     private AnalyzeRequest prepareStorage(InputStream stream) {
 
@@ -1875,7 +1585,9 @@ public class RedactionIntegrationTest {
                 .lastProcessed(OffsetDateTime.now())
                 .build();
 
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.ORIGIN), stream);
+        var bytes = IOUtils.toByteArray(stream);
+
+        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.ORIGIN), bytes);
 
         return request;
 

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

@@ -1,741 +0,0 @@
-package com.iqser.red.service.redaction.v1.server;
-
-import static java.util.Map.entry;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.math.BigInteger;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-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.test.annotation.IfProfileValue;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.Change;
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.model.ManualChange;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogComment;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionLogLegalBasis;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
-import com.iqser.red.service.redaction.v1.server.annotate.AnnotationService;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
-
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Import(RulesTest.RulesTestConfiguration.class)
-public class RulesTest {
-
-    private static final String RULES_PATH = "drools/testRules.drl";
-    private static final String RULES = loadFromClassPath(RULES_PATH);
-    private static final String VERTEBRATE = "vertebrate";
-    private static final String ADDRESS = "CBI_address";
-    private static final String AUTHOR = "CBI_author";
-    private static final String SPONSOR = "CBI_sponsor";
-    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
-    private static final String REDACTION_INDICATOR = "redaction_indicator";
-    private static final String HINT_ONLY = "hint_only";
-    private static final String MUST_REDACT = "must_redact";
-    private static final String PUBLISHED_INFORMATION = "published_information";
-    private static final String TEST_METHOD = "test_method";
-    private static final String PURITY = "purity";
-    private static final String IMAGE = "image";
-    private static final String LOGO = "logo";
-    private static final String SIGNATURE = "signature";
-    private static final String FORMULA = "formula";
-    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 PII = "PII";
-    private static final String RESOURCES_PATH = "src/test/resources/";
-    private static final String REDACTION_LOG_PATH = "RedactionLog/";
-    private static final String REDACTION_LOG_RESOURCES_PATH = RESOURCES_PATH + REDACTION_LOG_PATH;
-    private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
-    private final static String TEST_DOSSIER_ID = "123";
-    private String TEST_FILE_ID = "123";
-    private int counter = 0;
-    private int fileSize = 0;
-    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 static final Map<String, String> typeColorMap = Map.ofEntries(entry(VERTEBRATE, "#ff85f7"), entry(ADDRESS, "#ffe187"), entry(AUTHOR, "#ffe187"), entry(SPONSOR, "#85ebff"), entry(NO_REDACTION_INDICATOR, "#be85ff"), entry(REDACTION_INDICATOR, "#caff85"), entry(HINT_ONLY, "#abc0c4"), entry(MUST_REDACT, "#fab4c0"), entry(PUBLISHED_INFORMATION, "#85ebff"), entry(TEST_METHOD, "#91fae8"), entry(PII, "#66ccff"), entry(PURITY, "#ffe187"), entry(IMAGE, "#fcc5fb"), entry(OCR, "#fcc5fb"), entry(LOGO, "#ffe187"), entry(FORMULA, "#ffe187"), entry(SIGNATURE, "#ffe187"), entry(IMPORTED_REDACTION, "#fcfbe6"));
-    private static final Map<String, Boolean> hintTypeMap = Map.ofEntries(entry(VERTEBRATE, true), entry(ADDRESS, false), entry(AUTHOR, false), entry(SPONSOR, false), entry(NO_REDACTION_INDICATOR, true), entry(REDACTION_INDICATOR, true), entry(HINT_ONLY, true), entry(MUST_REDACT, true), entry(PUBLISHED_INFORMATION, true), entry(TEST_METHOD, true), entry(PII, false), entry(PURITY, false), entry(IMAGE, true), entry(OCR, true), entry(FORMULA, false), entry(LOGO, false), entry(SIGNATURE, false), entry(DOSSIER_REDACTIONS, false), entry(IMPORTED_REDACTION, false));
-    private static final Map<String, Boolean> caseInSensitiveMap = Map.ofEntries(entry(VERTEBRATE, true), entry(ADDRESS, false), entry(AUTHOR, false), entry(SPONSOR, false), entry(NO_REDACTION_INDICATOR, true), entry(REDACTION_INDICATOR, true), entry(HINT_ONLY, true), entry(MUST_REDACT, true), entry(PUBLISHED_INFORMATION, true), entry(TEST_METHOD, false), entry(PII, false), entry(PURITY, false), entry(IMAGE, true), entry(OCR, true), entry(SIGNATURE, true), entry(LOGO, true), entry(FORMULA, true), entry(DOSSIER_REDACTIONS, false), entry(IMPORTED_REDACTION, false));
-    private static final Map<String, Boolean> recommendationTypeMap = Map.ofEntries(entry(VERTEBRATE, false), entry(ADDRESS, false), entry(AUTHOR, false), entry(SPONSOR, false), entry(NO_REDACTION_INDICATOR, false), entry(REDACTION_INDICATOR, false), entry(HINT_ONLY, false), entry(MUST_REDACT, false), entry(PUBLISHED_INFORMATION, false), entry(TEST_METHOD, false), entry(PII, false), entry(PURITY, false), entry(IMAGE, false), entry(OCR, false), entry(FORMULA, false), entry(SIGNATURE, false), entry(LOGO, false), entry(DOSSIER_REDACTIONS, false), entry(IMPORTED_REDACTION, false));
-    private static final Map<String, Integer> rankTypeMap = Map.ofEntries(entry(PURITY, 155), entry(PII, 150), entry(ADDRESS, 140), entry(AUTHOR, 130), entry(SPONSOR, 120), entry(VERTEBRATE, 110), entry(MUST_REDACT, 100), entry(REDACTION_INDICATOR, 90), entry(NO_REDACTION_INDICATOR, 80), entry(PUBLISHED_INFORMATION, 70), entry(TEST_METHOD, 60), entry(HINT_ONLY, 50), entry(IMAGE, 30), entry(OCR, 29), entry(LOGO, 28), entry(SIGNATURE, 27), entry(FORMULA, 26), entry(DOSSIER_REDACTIONS, 200), entry(IMPORTED_REDACTION, 200));
-    private final Colors colors = new Colors();
-
-    @Autowired
-    private RedactionController redactionController;
-    @Autowired
-    private AnnotationService annotationService;
-    @Autowired
-    private AnalyzeService analyzeService;
-    @Autowired
-    private ObjectMapper objectMapper;
-    @MockBean
-    private RulesClient rulesClient;
-    @MockBean
-    private DictionaryClient dictionaryClient;
-    @Autowired
-    private RedactionStorageService redactionStorageService;
-    @Autowired
-    private StorageService storageService;
-    @Autowired
-    private ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
-    @MockBean
-    private AmazonS3 amazonS3;
-    @MockBean
-    private RabbitTemplate rabbitTemplate;
-    @MockBean
-    private LegalBasisClient legalBasisClient;
-
-
-    @Before
-    public void stubClients() {
-
-        objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
-        when(rulesClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(rulesClient.getRules(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(JSONPrimitive.of(RULES));
-
-        loadDictionaryForTest();
-        loadTypeForTest();
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossierTemplate(TEST_DOSSIER_TEMPLATE_ID, false)).thenReturn(getTypeResponse());
-
-        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(0L);
-        when(dictionaryClient.getAllTypesForDossier(TEST_DOSSIER_ID, false)).thenReturn(List.of(Type.builder()
-                .id(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID)
-                .type(DOSSIER_REDACTIONS)
-                .dossierTemplateId(TEST_DOSSIER_ID)
-                .hexColor("#ffe187")
-                .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
-                .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
-                .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
-                .rank(rankTypeMap.get(DOSSIER_REDACTIONS))
-                .build()));
-
-        mockDictionaryCalls(null);
-        mockDictionaryCalls(0L);
-
-        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
-    }
-
-
-    @After
-    public void cleanupStorage() {
-
-        if (this.storageService instanceof FileSystemBackedStorageService) {
-            ((FileSystemBackedStorageService) this.storageService).clearStorage();
-        }
-    }
-
-
-    /**
-     * Generates RedactionLog for given file and saves it here: REDACTION_LOG_PATH.
-     * If the RedactionLog already exists, it will be overwritten
-     * Test is ignored, because it's for manual tests.
-     */
-    @Ignore
-    @Test
-    public void generateRedactionLogForOneFile() {
-
-        String fileName = "files/Compounds/31 A14111B - EU AIR3 - MCP Section 1 - Identity of the plant protection product.pdf";
-        fileSize = 1;
-        generateAndSaveRedactionLog(fileName, true);
-    }
-
-
-    /**
-     * Generates RedactionLog for all files and saves it here: REDACTION_LOG_PATH.
-     * If a RedactionLog already exists, the generating for this will be skipped
-     * Please commit generated files, if not the following tests will fail
-     */
-    @Test
-    public void generateRedactionLogForAllFiles() {
-
-        Set<String> files = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH));
-        System.out.println("Will generate RedactionLog for " + files.size() + " files.");
-        fileSize = files.size();
-        files.forEach(this::generateAndSaveRedactionLog);
-    }
-
-
-    /**
-     * Analyses file and compares its RedactionLog with saved one from here: REDACTION_LOG_PATH.
-     * If RedactionLog Json does not exist, test will fail.
-     */
-    @Test
-    public void analyseFileAndCompareRedactionLog() {
-
-        String fileName = "files/RulesTest/SYNGENTA_EFSA_sanitisation_GFL_v1_withHighlights.pdf";
-        fileSize = 1;
-        analyseFileAndCompareRedactionLog(fileName);
-    }
-
-
-    /**
-     * Analyses all files and compares its RedactionLog with saved one from here: REDACTION_LOG_PATH.
-     * If RedactionLog Json for one file does not exist, whole test will fail.
-     */
-    @IfProfileValue(name = "test-groups", value = "rules-test")
-    @Test
-    public void analyseAllFilesAndCompareRedactionLogs() {
-
-        Set<String> fileNames = getFileNames(new HashSet<>(), FileSystems.getDefault().getPath(RESOURCES_PATH));
-        System.out.println("Will analyse " + fileNames.size() + " files and compare its RedactionLogs.");
-        fileSize = fileNames.size();
-
-        Map<String, AssertionError> failedFiles = new HashMap<>();
-
-        for (String fileName : fileNames) {
-
-            try {
-                analyseFileAndCompareRedactionLog(fileName);
-            } catch (AssertionError assertionError) {
-                failedFiles.put(fileName, assertionError);
-            }
-        }
-
-        if (!failedFiles.isEmpty()) {
-            log.warn("WARNING: {} files from {} failed", failedFiles.size(), fileSize);
-            for (String fileName : failedFiles.keySet()) {
-                log.warn(" - '{}' failed with Error: {} See line {} in {}", fileName, failedFiles.get(fileName), failedFiles.get(fileName)
-                        .getStackTrace()[0].getLineNumber(), failedFiles.get(fileName).getStackTrace()[0].getClassName());
-            }
-        }
-
-        assertThat(failedFiles).isEmpty();
-
-    }
-
-
-    private void generateAndSaveRedactionLog(String fileName) {
-
-        generateAndSaveRedactionLog(fileName, false);
-    }
-
-
-    @SneakyThrows
-    private void generateAndSaveRedactionLog(String fileName, boolean force) {
-
-        counter++;
-        if (!force && doesRedactionLogExist(fileName)) {
-            System.out.println("(" + counter + "/" + fileSize + ") Skip generating RedactionLog as Json for " + fileName + " because it already exists.");
-
-        } else {
-            generateTestFileId(fileName);
-
-            System.out.println("(" + counter + "/" + fileSize + ") Generate RedactionLog as Json for " + fileName + " with fileId " + TEST_FILE_ID);
-
-            loadNerForTest();
-
-            AnalyzeRequest request = prepareStorage(fileName);
-            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-            analyzeService.analyze(request);
-
-            RedactionLog redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-            saveRedactionLogAsJson(redactionLog, fileName);
-
-        }
-    }
-
-
-    @SneakyThrows
-    public void analyseFileAndCompareRedactionLog(String fileName) {
-
-        counter++;
-        generateTestFileId(fileName);
-        System.out.println("(" + counter + "/" + fileSize + ") Analyse " + fileName + " with fileId " + TEST_FILE_ID + " and compare it with its saved RedactionLog");
-
-        RedactionLog savedRedactionLog = loadSavedRedactionLog(fileName);
-
-        loadNerForTest();
-
-        AnalyzeRequest request = prepareStorage(fileName);
-        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
-        analyzeService.analyze(request);
-
-        RedactionLog redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
-
-        // All timestamps are ignored, because they are for sure different
-        assertThat(redactionLog.getAnalysisVersion()).isEqualTo(savedRedactionLog.getAnalysisVersion());
-        assertThat(redactionLog.getAnalysisNumber()).isEqualTo(savedRedactionLog.getAnalysisNumber());
-        assertThat(redactionLog.getDictionaryVersion()).isEqualTo(savedRedactionLog.getDictionaryVersion());
-        assertThat(redactionLog.getDossierDictionaryVersion()).isEqualTo(savedRedactionLog.getDossierDictionaryVersion());
-        assertThat(redactionLog.getRulesVersion()).isEqualTo(savedRedactionLog.getRulesVersion());
-        assertThat(redactionLog.getLegalBasisVersion()).isEqualTo(savedRedactionLog.getLegalBasisVersion());
-
-        assertThat(redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(r -> !r.isFalsePositive())
-                .collect(Collectors.toSet())
-                .size()).isEqualTo(savedRedactionLog.getRedactionLogEntry().stream().filter(r -> !r.isFalsePositive()).collect(Collectors.toSet()).size());
-        assertThat(redactionLog.getLegalBasis().size()).isEqualTo(savedRedactionLog.getLegalBasis().size());
-
-        for (RedactionLogLegalBasis redactionLegalBasis : redactionLog.getLegalBasis()) {
-            var savedRedactionLegalBasis = savedRedactionLog.getLegalBasis()
-                    .stream()
-                    .filter(lb -> lb.getName().equalsIgnoreCase(redactionLegalBasis.getName()))
-                    .filter(lb -> lb.getDescription().equalsIgnoreCase(redactionLegalBasis.getDescription()))
-                    .filter(lb -> lb.getReason().equalsIgnoreCase(redactionLegalBasis.getReason()))
-                    .findFirst();
-            assertThat(savedRedactionLegalBasis).isPresent();
-        }
-
-        for (RedactionLogEntry redactionLogEntry : redactionLog.getRedactionLogEntry()) {
-            var savedRedactionLogEntry = savedRedactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findFirst();
-            assertThat(savedRedactionLogEntry).isPresent();
-            assertThat(savedRedactionLogEntry.get().getId()).isEqualTo(redactionLogEntry.getId());
-            assertThat(savedRedactionLogEntry.get().getType()).isEqualTo(redactionLogEntry.getType());
-            assertThat(savedRedactionLogEntry.get().getValue()).isEqualTo(redactionLogEntry.getValue());
-            assertThat(savedRedactionLogEntry.get().getReason()).isEqualTo(redactionLogEntry.getReason());
-            assertThat(savedRedactionLogEntry.get().getMatchedRule()).isEqualTo(redactionLogEntry.getMatchedRule());
-            assertThat(savedRedactionLogEntry.get().isRectangle()).isEqualTo(redactionLogEntry.isRectangle());
-            assertThat(savedRedactionLogEntry.get().getLegalBasis()).isEqualTo(redactionLogEntry.getLegalBasis());
-            assertThat(savedRedactionLogEntry.get().isImported()).isEqualTo(redactionLogEntry.isImported());
-            assertThat(savedRedactionLogEntry.get().isRedacted()).isEqualTo(redactionLogEntry.isRedacted());
-            assertThat(savedRedactionLogEntry.get().isHint()).isEqualTo(redactionLogEntry.isHint());
-            assertThat(savedRedactionLogEntry.get().isRecommendation()).isEqualTo(redactionLogEntry.isRecommendation());
-            assertThat(savedRedactionLogEntry.get().isFalsePositive()).isEqualTo(redactionLogEntry.isFalsePositive());
-            assertThat(savedRedactionLogEntry.get().getSection()).isEqualTo(redactionLogEntry.getSection());
-            assertThat(savedRedactionLogEntry.get().getColor()).isEqualTo(redactionLogEntry.getColor());
-            assertThat(savedRedactionLogEntry.get().getSectionNumber()).isEqualTo(redactionLogEntry.getSectionNumber());
-            assertThat(savedRedactionLogEntry.get().getTextBefore()).isEqualTo(redactionLogEntry.getTextBefore());
-            assertThat(savedRedactionLogEntry.get().getTextAfter()).isEqualTo(redactionLogEntry.getTextAfter());
-            assertThat(savedRedactionLogEntry.get().getStartOffset()).isEqualTo(redactionLogEntry.getStartOffset());
-            assertThat(savedRedactionLogEntry.get().getEndOffset()).isEqualTo(redactionLogEntry.getEndOffset());
-            assertThat(savedRedactionLogEntry.get().isImage()).isEqualTo(redactionLogEntry.isImage());
-            assertThat(savedRedactionLogEntry.get().isImageHasTransparency()).isEqualTo(redactionLogEntry.isImageHasTransparency());
-            assertThat(savedRedactionLogEntry.get().isDictionaryEntry()).isEqualTo(redactionLogEntry.isDictionaryEntry());
-            assertThat(savedRedactionLogEntry.get().isDossierDictionaryEntry()).isEqualTo(redactionLogEntry.isDossierDictionaryEntry());
-            assertThat(savedRedactionLogEntry.get().isExcluded()).isEqualTo(redactionLogEntry.isExcluded());
-            assertThat(savedRedactionLogEntry.get().getSourceId()).isEqualTo(redactionLogEntry.getSourceId());
-
-            for (Rectangle rectangle : redactionLogEntry.getPositions()) {
-                var savedRectangle = savedRedactionLogEntry.get()
-                        .getPositions()
-                        .stream()
-                        .filter(r -> r.getPage() == rectangle.getPage())
-                        .filter(r -> r.getTopLeft().getX() == rectangle.getTopLeft().getX())
-                        .filter(r -> r.getTopLeft().getY() == rectangle.getTopLeft().getY())
-                        .filter(r -> r.getHeight() == rectangle.getHeight())
-                        .filter(r -> r.getWidth() == rectangle.getWidth())
-                        .findFirst();
-                assertThat(savedRectangle).isPresent();
-            }
-
-            for (RedactionLogComment comment : redactionLogEntry.getComments()) {
-                var savedComment = savedRedactionLogEntry.get().getComments().stream().filter(c -> c.getId() == comment.getId()).findFirst();
-                assertThat(savedComment).isPresent();
-                assertThat(savedComment.get().getId()).isEqualTo(comment.getId());
-                assertThat(savedComment.get().getUser()).isEqualTo(comment.getUser());
-                assertThat(savedComment.get().getText()).isEqualTo(comment.getText());
-                assertThat(savedComment.get().getAnnotationId()).isEqualTo(comment.getAnnotationId());
-                assertThat(savedComment.get().getFileId()).isEqualTo(comment.getFileId());
-
-            }
-
-            for (Change change : redactionLogEntry.getChanges()) {
-                var savedChange = savedRedactionLogEntry.get()
-                        .getChanges()
-                        .stream()
-                        .filter(c -> c.getAnalysisNumber() == change.getAnalysisNumber())
-                        .filter(c -> c.getType() == change.getType())
-                        .findFirst();
-                assertThat(savedChange).isPresent();
-            }
-
-            for (ManualChange manualChange : redactionLogEntry.getManualChanges()) {
-                var savedManualChange = savedRedactionLogEntry.get()
-                        .getManualChanges()
-                        .stream()
-                        .filter(m -> m.getAnnotationStatus() == manualChange.getAnnotationStatus())
-                        .filter(m -> m.getManualRedactionType() == manualChange.getManualRedactionType())
-                        .filter(m -> m.getUserId().equalsIgnoreCase(manualChange.getUserId()))
-                        .filter(m -> m.getPropertyChanges() == manualChange.getPropertyChanges())
-                        .findFirst();
-                assertThat(savedManualChange).isPresent();
-            }
-
-            assertThat(savedRedactionLogEntry.get().getEngines()).containsExactlyInAnyOrder(redactionLogEntry.getEngines().toArray(new Engine[0]));
-
-            assertThat(savedRedactionLogEntry.get().getReference()).containsAll(redactionLogEntry.getReference());
-            assertThat(savedRedactionLogEntry.get().getImportedRedactionIntersections()).containsAll(redactionLogEntry.getImportedRedactionIntersections());
-        }
-
-    }
-
-
-    private boolean doesRedactionLogExist(String pdfFileName) {
-
-        File pdfFile = new File(pdfFileName);
-        String directory = REDACTION_LOG_RESOURCES_PATH + pdfFile.getParentFile().getPath();
-        String fileName = StringUtils.replace(pdfFile.getName(), ".pdf", ".json");
-        File file = new File(directory, fileName);
-        return file.exists();
-
-    }
-
-
-    @SneakyThrows
-    private void generateTestFileId(String fileName) {
-
-        MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
-        messageDigest.update(fileName.getBytes());
-        TEST_FILE_ID = new BigInteger(1, messageDigest.digest()).toString(16);
-    }
-
-
-    @SneakyThrows
-    private void saveRedactionLogAsJson(RedactionLog redactionLog, String pdfFileName) {
-
-        File pdfFile = new File(pdfFileName);
-
-        String directory = REDACTION_LOG_RESOURCES_PATH + pdfFile.getParentFile().getPath();
-        File dr = new File(directory);
-        boolean created = dr.mkdirs();
-        if (created) {
-            System.out.println("Directory was created");
-        }
-
-        String fileName = StringUtils.replace(pdfFile.getName(), ".pdf", ".json");
-        File file = new File(directory, fileName);
-
-        objectMapper.writeValue(file, redactionLog);
-
-        System.out.println("Saved RedactionLog for " + fileName + " here " + directory);
-    }
-
-
-    @SneakyThrows
-    private RedactionLog loadSavedRedactionLog(String pdfFileName) {
-
-        File pdfFile = new File(pdfFileName);
-        String directory = cleanPath(pdfFile.getParentFile().getPath());
-        if (StringUtils.contains(directory, RESOURCES_PATH)) {
-            if (!StringUtils.endsWith(directory, "/")) {
-                directory = directory + "/";
-            }
-            directory = directory + REDACTION_LOG_PATH;
-        } else {
-            if (StringUtils.startsWith(directory, "/")) {
-                directory = StringUtils.substring(directory, 1);
-            }
-            directory = REDACTION_LOG_RESOURCES_PATH + directory;
-        }
-        String fileName = StringUtils.replace(pdfFile.getName(), ".pdf", ".json");
-
-        File file = new File(directory, fileName);
-        assertThat(file).exists();
-
-        return objectMapper.readValue(file, RedactionLog.class);
-    }
-
-
-    @SneakyThrows
-    private Set<String> getFileNames(Set<String> fileNames, Path dir) {
-
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
-            for (Path path : stream) {
-                if (path.toFile().isDirectory()) {
-                    getFileNames(fileNames, path);
-                } else if (StringUtils.endsWith(path.toAbsolutePath().toString(), ".pdf")) {
-                    String absolutePath = cleanPath(path.toAbsolutePath().toString());
-                    int pos = StringUtils.indexOf(absolutePath, RESOURCES_PATH) + RESOURCES_PATH.length();
-
-                    fileNames.add(StringUtils.substring(absolutePath, pos));
-                }
-            }
-        }
-        return fileNames;
-    }
-
-
-    private String cleanPath(String path) {
-
-        return StringUtils.replace(path, "\\", "/");
-    }
-
-
-    @SneakyThrows
-    private void loadNerForTest() {
-
-        ClassPathResource responseJson = new ClassPathResource("files/ner_response.json");
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.NER_ENTITIES), responseJson.getInputStream());
-    }
-
-
-    @SneakyThrows
-    private AnalyzeRequest prepareStorage(String file) {
-
-        ClassPathResource pdfFileResource = new ClassPathResource(file);
-
-        return prepareStorage(pdfFileResource.getInputStream());
-    }
-
-
-    @SneakyThrows
-    private AnalyzeRequest prepareStorage(InputStream stream) {
-
-        AnalyzeRequest request = AnalyzeRequest.builder()
-                .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                .dossierId(TEST_DOSSIER_ID)
-                .fileId(TEST_FILE_ID)
-                .lastProcessed(OffsetDateTime.now())
-                .build();
-
-        storageService.storeObject(RedactionStorageService.StorageIdUtils.getStorageId(TEST_DOSSIER_ID, TEST_FILE_ID, FileType.ORIGIN), stream);
-
-        return request;
-
-    }
-
-
-    private void loadDictionaryForTest() {
-
-        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_author.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/vertebrate.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(NO_REDACTION_INDICATOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/no_redaction_indicator.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(REDACTION_INDICATOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/redaction_indicator.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(HINT_ONLY, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/hint_only.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(MUST_REDACT, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/must_redact.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(PUBLISHED_INFORMATION, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/published_information.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(TEST_METHOD, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/test_method.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(PII, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/PII.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(PURITY, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/purity.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(IMAGE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(OCR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(LOGO, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(SIGNATURE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(FORMULA, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dossierDictionary.computeIfAbsent(DOSSIER_REDACTIONS, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/dossier_redactions.txt").stream().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()));
-
-    }
-
-
-    private void loadTypeForTest() {
-
-        colors.setSkippedColor("#cccccc");
-        colors.setRequestAddColor("#04b093");
-        colors.setRequestRemoveColor("#04b093");
-    }
-
-
-    private List<Type> getTypeResponse() {
-
-        return typeColorMap.entrySet()
-                .stream()
-                .map(typeColor -> Type.builder()
-                        .id(typeColor.getKey() + ":" + TEST_DOSSIER_TEMPLATE_ID)
-                        .type(typeColor.getKey())
-                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                        .hexColor(typeColor.getValue())
-                        .isHint(hintTypeMap.get(typeColor.getKey()))
-                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
-                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
-                        .rank(rankTypeMap.get(typeColor.getKey()))
-                        .build())
-
-                .collect(Collectors.toList());
-    }
-
-
-    private void mockDictionaryCalls(Long version) {
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
-        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(PURITY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PURITY, false));
-        when(dictionaryClient.getDictionaryForType(IMAGE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMAGE, false));
-        when(dictionaryClient.getDictionaryForType(OCR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(OCR, false));
-        when(dictionaryClient.getDictionaryForType(LOGO + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(FORMULA, false));
-        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
-        when(dictionaryClient.getDictionaryForType(IMPORTED_REDACTION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(IMPORTED_REDACTION, true));
-
-    }
-
-
-    private String cleanDictionaryEntry(String entry) {
-
-        return TextNormalizationUtilities.removeHyphenLineBreaks(entry).replaceAll("\\n", " ");
-    }
-
-
-    private Type getDictionaryResponse(String type, boolean isDossierDictionary) {
-
-        return Type.builder()
-                .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(new ArrayList<>())
-                .isHint(hintTypeMap.get(type))
-                .isCaseInsensitive(caseInSensitiveMap.get(type))
-                .isRecommendation(recommendationTypeMap.get(type))
-                .rank(rankTypeMap.get(type))
-                .build();
-    }
-
-
-    private List<DictionaryEntry> toDictionaryEntry(List<String> entries) {
-
-        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
-        entries.forEach(entry -> dictionaryEntries.add(DictionaryEntry.builder().value(entry).version(0L).deleted(false).build()));
-        return dictionaryEntries;
-    }
-
-
-    private static String loadFromClassPath(String path) {
-
-        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
-        if (resource == null) {
-            throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
-        }
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
-            StringBuilder sb = new StringBuilder();
-            String str;
-            while ((str = br.readLine()) != null) {
-                sb.append(str).append("\n");
-            }
-            return sb.toString();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("could not load classpath resource: " + path, e);
-        }
-    }
-
-
-    @Configuration
-    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
-    public static class RulesTestConfiguration {
-
-        @Bean
-        public KieContainer kieContainer() {
-
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            InputStream input = new ByteArrayInputStream(RULES.getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write(RESOURCES_PATH + RULES_PATH, kieServices.getResources().newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        }
-
-
-        @Bean
-        @Primary
-        public StorageService inmemoryStorage() {
-
-            return new FileSystemBackedStorageService();
-        }
-
-    }
-
-}

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/parsing/model/TextPositionSequenceTest.java

@@ -1,71 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.pdfbox.util.Matrix;
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.storage.commons.properties.StorageProperties;
-import com.iqser.red.storage.commons.service.ObjectSerializer;
-
-import lombok.SneakyThrows;
-
-public class TextPositionSequenceTest {
-
-    private static final String TEXT_POSITION_SEQUENCE_AS_JSON = "{\n" //
-            + "  \"page\": 1,\n" //
-            + "  \"textPositions\": [],\n" //
-            + "  \"dir\": 180.0,\n" //
-            + "  \"rotation\": 0,\n" //
-            + "  \"pageHeight\": 800,\n" //
-            + "  \"pageWidth\": 600\n"  //
-            + "}";
-
-    private final ObjectSerializer objectSerializer = new ObjectSerializer(new ObjectMapper(), new StorageProperties());
-
-
-    @Test
-    @SneakyThrows
-    public void testDeserializationWithJackson() {
-
-        TextPositionSequence textPositionSequence = objectSerializer.deserializeWithJackson(
-                new ByteArrayInputStream(TEXT_POSITION_SEQUENCE_AS_JSON.getBytes(StandardCharsets.UTF_8)),
-                TextPositionSequence.class);
-
-        assertPropertiesAfterJsonDeserialization(textPositionSequence);
-    }
-
-
-    private void assertPropertiesAfterJsonDeserialization(TextPositionSequence textPositionSequence) {
-
-        assertThat(textPositionSequence.getPage()).isEqualTo(1);
-        assertThat(textPositionSequence.getTextPositions()).hasSize(0);
-        assertThat(textPositionSequence.getDir()).isEqualTo(TextDirection.HALF_CIRCLE);
-        assertThat(textPositionSequence.getRotation()).isEqualTo(0);
-        assertThat(textPositionSequence.getPageHeight()).isEqualTo(800f);
-        assertThat(textPositionSequence.getPageWidth()).isEqualTo(600f);
-    }
-
-
-    @Test
-    @SneakyThrows
-    public void testDeserializationWithDslJson() {
-
-        TextPositionSequence textPositionSequence = objectSerializer.deserializeWithDslJson(
-                new ByteArrayInputStream(TEXT_POSITION_SEQUENCE_AS_JSON.getBytes(StandardCharsets.UTF_8)),
-                TextPositionSequence.class);
-
-        assertPropertiesAfterJsonDeserialization(textPositionSequence);
-    }
-
-
-    private Matrix createIdentityMatrix() {
-
-        return new Matrix();
-    }
-
-}

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

@@ -1,104 +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 com.iqser.red.service.redaction.v1.server.annotate.AnnotationService;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-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";
-
-    @Autowired
-    private AnnotationService annotationService;
-
-    @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 redactionLog = redactionStorageService.getRedactionLog("dossierId","fileId");
-//        redactionLog.getRedactionLogEntry().forEach(entry ->{
-//            log.info("Entry {}", entry);
-//        });
-//
-//        var annotated = annotationService.annotate(AnnotateRequest.builder().fileId("fileId").dossierId("dossierId").build());
-//        annotated.getDocument();
-//
-//        File tempFile = File.createTempFile("annotated",".pdf");
-//        IOUtils.write(annotated.getDocument(), new FileOutputStream(tempFile));
-//        log.warn("File saved to: {}",tempFile.getAbsolutePath());
-//        Runtime.getRuntime().exec("open "+tempFile.getAbsolutePath());
-    }
-
-
-}

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

@@ -1,216 +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.Objects;
-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()));
-                type.setFalsePositiveEntries(getFalsePositiveEntries(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 (Objects.requireNonNull(resource.getFilename()).contains(typeName) && !resource.getFilename().contains("false_positive")) {
-
-                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<>();
-    }
-
-    @SneakyThrows
-    private List<DictionaryEntry> getFalsePositiveEntries(String typeName, String typeId) {
-
-        Resource[] dictionaryResources = resourcePatternResolver.getResources("classpath:" + BASE_DIR + EFSA_SANITISATION_GFL_V1 + "dictionaries/**");
-        for (var resource : dictionaryResources) {
-            if (Objects.requireNonNull(resource.getFilename()).contains(typeName) && resource.getFilename().contains("false_positive")) {
-
-                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/RegExPatternTest.java

@@ -1,13 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+
 public class RegExPatternTest {
 
 

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

@@ -1,17 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.redaction.v1.server.Application;
+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.service.BlockificationService;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.redaction.model.image.ImageServiceResponse;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -25,20 +31,20 @@ import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.redaction.v1.server.Application;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.model.image.ImageServiceResponse;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+import javax.imageio.ImageIO;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.utils.OsUtils.getTemporaryDirectory;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import lombok.SneakyThrows;
 
@@ -83,18 +89,15 @@ public class PdfSegmentationServiceTest {
 
     @Test
     @SneakyThrows
-    public void testMapping() {
-
+    public void testMapping(){
         ClassPathResource responseJson = new ClassPathResource("files/image_response.json");
         ImageServiceResponse imageServiceResponse = objectMapper.readValue(responseJson.getInputStream(), ImageServiceResponse.class);
 
         Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getData()
-                .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.isAlpha(), imageMetadata.getPosition().getPageNumber())));
+        imageServiceResponse.getData().stream().forEach(imageMetadata -> {
+            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
+                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)), imageMetadata.getPosition().getPageNumber()));
+        });
 
         System.out.println("object");
     }