test serializer error

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,80 +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 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"))))
+                .stages(new Stage("Default Stage")
+                        .jobs(new Job("Default Job",
+                                new BambooKey("JOB1"))
+                                .tasks(
+                                        new ScriptTask()
+                                                .description("Clean")
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+                                                        "rm -rf ./*"),
+                                        new VcsCheckoutTask()
+                                                .description("Checkout Default Repository")
+                                                .cleanCheckout(true)
+                                                .checkoutItems(new CheckoutItem().defaultRepository()),
+                                        new ScriptTask()
+                                                .description("Build")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
+                                                .argument(SERVICE_NAME),
+                                        createJUnitParserTask()
+                                                .description("Resultparser")
+                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                                .enabled(true),
+                                        new InjectVariablesTask()
+                                                .description("Inject git Tag")
+                                                .path("git.tag")
+                                                .namespace("g")
+                                                .scope(InjectVariablesScope.LOCAL),
+                                        new VcsTagTask()
+                                                .description("${bamboo.g.gitTag}")
+                                                .tagName("${bamboo.g.gitTag}")
+                                                .defaultRepository())
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
                 .linkedRepositories("RED / " + SERVICE_NAME)
 
                 .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
-                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranch()
+                        .delete(new BranchCleanup()
+                                .whenInactiveInRepositoryAfterDays(14))
                         .notificationForCommitters());
     }
 
-
-    public Plan createNightPlan() {
-
-        return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests")
-                .variables(new Variable("maven_add_param", "-Dtest-groups=rules-test"))
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new CleanWorkingDirectoryTask().description("Clean working directory.")
-                                .enabled(true), new VcsCheckoutTask().description("Checkout Default Repository")
-                                .cleanCheckout(true)
-                                .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build")
-                                .location(Location.FILE)
-                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                .argument(SERVICE_NAME), createJUnitParserTask().description("Resultparser")
-                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                .enabled(true))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters());
-    }
-
-
     public Plan createSecBuild() {
-
-        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
-                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
-                                .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository")
-                                .cleanCheckout(true)
-                                .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Sonar")
-                                .location(Location.FILE)
-                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                .argument(SERVICE_NAME))
-                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                .dockerRunArguments("--net=host")
-                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
+        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/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/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

@@ -29,10 +29,15 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.dslplatform</groupId>
+                <artifactId>dsl-json-java8</artifactId>
+                <version>${dsljson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.20.0</version>
+                <version>1.13.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

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

@@ -12,7 +12,7 @@
     <artifactId>redaction-service-api-v1</artifactId>
 
     <properties>
-        <persistence-service.version>1.254.0</persistence-service.version>
+        <persistence-service.version>1.166.0</persistence-service.version>
     </properties>
 
     <dependencies>

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

@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.dslplatform.json.CompiledJson;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,7 +11,6 @@ import java.util.Map;
 
 @Data
 @Builder
-@CompiledJson
 @NoArgsConstructor
 @AllArgsConstructor
 public class ImportedRedactions {

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

@@ -38,12 +38,6 @@
             <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>

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

@@ -27,15 +27,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<>();
 
 

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

@@ -23,30 +23,16 @@ 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;
 
 

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

@@ -5,8 +5,8 @@ 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;
 
@@ -16,6 +16,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class NerEntities {
 
-    private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
+   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,29 @@
 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.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
@@ -42,7 +37,6 @@ public class RedactionController implements RedactionResource {
     private final RedactionLogMergeService redactionLogMergeService;
     private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
 
-
     @Override
     public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
 
@@ -124,17 +118,14 @@ 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);
     }
 
@@ -143,14 +134,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/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/model/RedTextPosition.java

@@ -21,20 +21,16 @@ import lombok.SneakyThrows;
 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
@@ -63,37 +59,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,7 +1,5 @@
 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;
@@ -19,7 +17,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -31,14 +28,11 @@ import lombok.extern.slf4j.Slf4j;
 @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 +41,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 +55,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 +85,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,26 +106,15 @@ 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();
-
     }
 
 
@@ -151,7 +122,7 @@ public class TextPositionSequence implements CharSequence {
     @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();
@@ -163,10 +134,11 @@ public class TextPositionSequence implements CharSequence {
     @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;
         }
     }
 
@@ -175,7 +147,15 @@ public class TextPositionSequence implements CharSequence {
     @JsonAttribute(ignore = true)
     public float getRotationAdjustedY() {
 
-        return textPositions.get(0).getYDirAdj();
+        return textPositions.get(0).getY();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
     }
 
 
@@ -183,10 +163,10 @@ public class TextPositionSequence implements CharSequence {
     @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();
         }
     }
 
@@ -195,10 +175,10 @@ public class TextPositionSequence implements CharSequence {
     @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();
         }
     }
 
@@ -207,7 +187,7 @@ public class TextPositionSequence implements CharSequence {
     @JsonAttribute(ignore = true)
     public float getTextHeight() {
 
-        return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
+        return textPositions.get(0).getHeightDir() + 2;
     }
 
 
@@ -272,39 +252,157 @@ public class TextPositionSequence implements CharSequence {
 
     @JsonIgnore
     @JsonAttribute(ignore = true)
-    @SneakyThrows
+    public int getRotation() {
+
+        return textPositions.get(0).getRotation();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
     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() == 0 && textPositions.get(0).getDir() == 90f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
+                    .getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 180f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
+
+            posXInit = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 90.0f) {
+            posXEnd = textPositions.get(0).getYDirAdj() + 2;
+            posYInit = getY1();
+            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 180.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() - 4;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getYDirAdj() - 2 - textPositions.get(textPositions.size() - 1)
+                    .getHeightDir();
+            posYEnd = textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() - textPositions.get(textPositions.size() - 1).getHeightDir();
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 270.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1();
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posYInit = textPositions.get(0).getPageHeight() - getY1();
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() - height - 4;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 0f) {
+
+            posXEnd = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 90f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() - 3;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 180f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 270.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj();
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = posYInit + 1;
+            posXInit = textPositions.get(0).getXDirAdj();
+            posXEnd = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 90.0f) {
+
+            posYInit = getX1();
+            posYEnd = getX2() - height;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 180.0f) {
+
+            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
+            posXEnd = textPositions.get(0).getPageWidth() - getX2() - 4;
+            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
+            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
+
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - height;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
 
-        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.);
+            // page rotation = 0 and text direction = 0
+            posXEnd = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
         }
 
-        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/Entity.java

@@ -1,14 +1,19 @@
 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 java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -19,7 +24,6 @@ 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<>();

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

@@ -9,11 +9,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-
-import lombok.Getter;
 
 public class SearchableText {
 
@@ -21,7 +17,6 @@ public class SearchableText {
     @JsonIgnore
     @JsonAttribute(ignore = true)
     private transient String stringRepresentation;
-    @Getter
     private final List<TextPositionSequence> sequences = new ArrayList<>();
 
 
@@ -105,7 +100,7 @@ public class SearchableText {
                                     .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++;
@@ -199,7 +194,7 @@ public class SearchableText {
     }
 
 
-    public static String buildString(List<TextPositionSequence> sequences) {
+    public String buildString(List<TextPositionSequence> sequences) {
 
         StringBuilder sb = new StringBuilder();
 
@@ -223,31 +218,6 @@ public class SearchableText {
     }
 
 
-    public String getAsStringWithLinebreaksSorted() {
-
-
-        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/Section.java

@@ -78,7 +78,7 @@ public class Section {
 
 
     @SuppressWarnings("unused")
-    @ThenAction
+    @WhenCondition
     public void addAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {
 
         Set<Entity> entitiesOfType = nerEntities.stream()
@@ -87,7 +87,6 @@ public class Section {
         List<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toList());
         Set<Entity> found = EntitySearchUtils.findEntities(searchText, new SearchImplementation(values, dictionary.isCaseInsensitiveDictionary(asType)), dictionary.getType(asType), new FindEntityDetails(asType, headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
         EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        found = found.stream().filter(f -> !f.isFalsePositive()).collect(Collectors.toSet());
 
         Set<Entity> finalResult = new HashSet<>();
 
@@ -113,7 +112,7 @@ public class Section {
 
 
     @SuppressWarnings("unused")
-    @ThenAction
+    @WhenCondition
     public void combineAiTypes(@Argument(ArgumentType.TYPE) String startType,
                                @Argument(ArgumentType.TYPE) String combineTypes,
                                @Argument(ArgumentType.INTEGER) int maxDistanceBetween,
@@ -527,54 +526,40 @@ public class Section {
     }
 
 
-    @Deprecated
     @ThenAction
     @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, false, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine, @Argument(ArgumentType.STRING) String reason,
+    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop,
+                              @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                              @Argument(ArgumentType.STRING) String reason,
                               @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, excludeHeadLine, reason, legalBasis, true);
+        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
     }
 
 
-    @Deprecated
     @ThenAction
     @SuppressWarnings("unused")
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+    public void redactNotBetween(@Argument(ArgumentType.STRING) String start,
+                                 @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                 @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                  @Argument(ArgumentType.STRING) String reason) {
 
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, false, reason, null, false);
+        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
     }
 
 
     @ThenAction
     @SuppressWarnings("unused")
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                 @Argument(ArgumentType.BOOLEAN) boolean excludeHeadLine, @Argument(ArgumentType.STRING) String reason) {
-
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, excludeHeadLine, reason, null, false);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.STRING) String stop,
+                                   @Argument(ArgumentType.TYPE) String asType,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                   @Argument(ArgumentType.STRING) String reason,
+                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
         redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
     }
@@ -582,8 +567,11 @@ public class Section {
 
     @ThenAction
     @SuppressWarnings("unused")
-    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start,
+                                      @Argument(ArgumentType.STRING) String stop,
+                                      @Argument(ArgumentType.TYPE) String asType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                      @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                       @Argument(ArgumentType.STRING) String reason) {
 
         redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
@@ -655,7 +643,7 @@ public class Section {
         while (matcher.find()) {
             String match = matcher.group(group);
             if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
             }
         }
     }
@@ -726,7 +714,8 @@ public class Section {
     @SuppressWarnings("unused")
     public void ignoreRecommendations(@Argument(ArgumentType.TYPE) String type) {
 
-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.RECOMMENDATION));
+        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType()
+                .equals(EntityType.RECOMMENDATION));
     }
 
 
@@ -812,7 +801,7 @@ public class Section {
                 }
 
                 if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(cleanValue);
+                    localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(cleanValue);
                 }
             }
         }
@@ -831,25 +820,9 @@ public class Section {
 
     @ThenAction
     @SuppressWarnings("unused")
-    public void redactSectionText(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
-                                  @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween("", "", type, ruleNumber, false, false, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSectionTextWithoutHeadLine(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                                 @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween("", "", type, ruleNumber, false, true, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    @SuppressWarnings("unused")
-    public void redactSection(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+    public void redactSection(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.STRING) String reason,
                               @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
         for (SectionArea sectionArea : sectionAreas) {
@@ -882,8 +855,8 @@ public class Section {
     }
 
 
-    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis,
-                                           boolean redaction) {
+    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType,
+                                           int ruleNumber, String reason, String legalBasis, boolean redaction) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
         Matcher matcher = compiledPattern.matcher(searchText);
@@ -892,7 +865,7 @@ public class Section {
             if (StringUtils.isNotBlank(match) && match.length() >= 3) {
                 Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE, false);
                 EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-                localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
             }
         }
     }
@@ -913,11 +886,13 @@ public class Section {
             }
         });
 
-        var cleared = EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
-        return cleared.stream().filter(f -> !f.isFalsePositive()).collect(Collectors.toSet());
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary, manualRedactions);
     }
 
 
+
+
+
     private void redact(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
 
         entities.forEach(entity -> {
@@ -1005,7 +980,7 @@ public class Section {
                     EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                     if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(value.trim());
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
                     }
                 }
             }
@@ -1013,29 +988,6 @@ public class Section {
     }
 
 
-
-    public void redactLineAfterAcrossColumns(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
-                                 String legalBasis) {
-
-
-        String[] values = StringUtils.substringsBetween(searchableText.getAsStringWithLinebreaksSorted(), start, "\n");
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(value.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-
     private void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber,
                                String reason, String legalBasis, boolean redaction) {
 
@@ -1053,24 +1005,10 @@ public class Section {
     }
 
 
-    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, boolean excludeHeadLine, String reason, String legalBasis,
-                               boolean redaction) {
+    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                               String reason, String legalBasis, boolean redaction) {
 
-        String[] values = new String[1];
-
-        if (start.isEmpty() && stop.isEmpty()) {
-            if (excludeHeadLine) {
-                values[0] = StringUtils.substringAfter(searchText, headline);
-            } else {
-                values[0] = searchText;
-            }
-        } else if (start.isEmpty() && searchText.contains(stop)) {
-            values[0] = StringUtils.substringBefore(searchText, stop);
-        } else if (stop.isEmpty() && searchText.contains(start)) {
-            values[0] = StringUtils.substringAfter(searchText, start);
-        } else {
-            values = StringUtils.substringsBetween(searchText, start, stop);
-        }
+        String[] values = StringUtils.substringsBetween(searchText, start, stop);
 
         if (values != null) {
             for (String value : values) {
@@ -1080,7 +1018,7 @@ public class Section {
                     EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                     if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(value.trim());
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
                     }
                 }
             }
@@ -1108,7 +1046,7 @@ public class Section {
                         EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
 
                         if (redactEverywhere && !isLocal()) {
-                            localDictionaryAdds.computeIfAbsent(asType, x -> new HashSet<>()).add(line.trim());
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
                         }
                     }
                 }

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

@@ -21,11 +21,4 @@ public class ImageServiceResponse {
     @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/service/AnalyzeService.java

@@ -1,21 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
@@ -24,31 +8,15 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.entity
 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.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.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.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
 import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
@@ -60,6 +28,15 @@ import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
 
 @Slf4j
 @Service
@@ -116,9 +93,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()
@@ -336,17 +312,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/DictionaryService.java

@@ -5,10 +5,12 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ty
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+
 import feign.FeignException;
 import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;
@@ -23,7 +25,6 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DictionaryService {
 
-    private static final String DEFAULT_COLOR = "#cccccc";
     private final DictionaryClient dictionaryClient;
 
     private final Map<String, DictionaryRepresentation> dictionariesByDossierTemplate = new HashMap<>();
@@ -177,10 +178,10 @@ public class DictionaryService {
 
                 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);

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

@@ -1,5 +1,18 @@
 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;
@@ -9,21 +22,24 @@ import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
 import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.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
@@ -35,6 +51,7 @@ public class EntityRedactionService {
     private final SurroundingWordsService surroundingWordsService;
 
 
+
     public PageEntities findEntities(Dictionary dictionary, List<SectionText> sectionTexts, KieContainer kieContainer,
                                      AnalyzeRequest analyzeRequest, NerEntities nerEntities) {
 
@@ -204,18 +221,20 @@ 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);
+            });
+        });
     }
 
 
@@ -245,8 +264,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, manualRedactions), nerFound);
     }
 
 

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

@@ -115,7 +115,7 @@ public class ImportedRedactionService {
         Point p = new Point();
 
         if (rectangle.getWidth() < 0) {
-            p.setX(rectangle.getTopLeft().getX() + rectangle.getWidth());
+            p.setX(rectangle.getTopLeft().getX() - rectangle.getWidth());
             r.setWidth(Math.abs(rectangle.getWidth()));
         } else {
             p.setX(rectangle.getTopLeft().getX());
@@ -127,7 +127,6 @@ public class ImportedRedactionService {
             r.setHeight(Math.abs(rectangle.getHeight()));
         } else {
             p.setY(rectangle.getTopLeft().getY());
-            r.setHeight(rectangle.getHeight());
         }
 
         r.setTopLeft(p);

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;
@@ -112,7 +114,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 +134,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 +207,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,42 +1,15 @@
 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.model.*;
 import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 
@@ -45,13 +18,20 @@ 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;
@@ -59,7 +39,6 @@ public class RedactionLogMergeService {
 
     @Timed("redactmanager_getMergedRedactionLog")
     public RedactionLog provideRedactionLog(RedactionRequest redactionRequest) {
-
         log.debug("Requested preview for: {}", redactionRequest);
 
         var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
@@ -93,16 +72,16 @@ public class RedactionLogMergeService {
         return merged;
     }
 
-
-    private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                               ManualRedactions manualRedactions, Set<Integer> excludedPages,
-                                               List<Type> types, Colors colors) {
+    private RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid, ManualRedactions manualRedactions,
+                                               Set<Integer> excludedPages, List<Type> types, Colors colors) {
 
         var skippedImportedRedactions = new HashSet<>();
+
         log.info("Merging Redaction log with manual redactions");
         if (manualRedactions != null) {
 
-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types, redactionLog.getAnalysisNumber());
+
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types);
 
             redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
 
@@ -133,12 +112,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 +179,7 @@ public class RedactionLogMergeService {
                 String manualOverrideReason = null;
                 if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
 
+
                     redactionLogEntry.setType(imageRecategorization.getType());
                     redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
 
@@ -219,20 +196,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 +219,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 +247,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 +273,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);
@@ -330,7 +296,7 @@ public class RedactionLogMergeService {
                     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) {
+                    if(manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
                         redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
                         redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
                     }
@@ -341,17 +307,16 @@ public class RedactionLogMergeService {
                     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) {
+                    if(manualResizeRedact.getTextBefore() != null || manualResizeRedact.getTextAfter() != null) {
                         redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
                         redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
                     }
                 }
 
                 redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.getManualChanges()
-                        .add(ManualChange.from(manualResizeRedact)
-                                .withManualRedactionType(ManualRedactionType.RESIZE)
-                                .withChange("value", manualResizeRedact.getValue()));
+                redactionLogEntry.getManualChanges().add(ManualChange.from(manualResizeRedact)
+                        .withManualRedactionType(ManualRedactionType.RESIZE)
+                        .withChange("value", manualResizeRedact.getValue()));
             }
 
         });
@@ -373,15 +338,14 @@ 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.setTextBefore(manualRedactionEntry.getTextBefore());
@@ -396,12 +360,9 @@ public class RedactionLogMergeService {
         return redactionLogEntries;
     }
 
-
     private List<RedactionLogComment> convert(List<Comment> comments) {
-
-        return comments == null ? null : comments.stream()
-                .map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(), c.getFileId(), c.getDate(), c.getSoftDeletedTime()))
-                .collect(Collectors.toList());
+        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());
     }
 
 
@@ -416,13 +377,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();
 
@@ -447,19 +408,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 +428,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 +444,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 +466,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/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(), null);
+                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,53 +122,56 @@ 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(), null);
+                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(), null);
             sectionText.getSectionAreas().add(sectionArea);
         }
 
@@ -179,7 +179,9 @@ public class SectionTextBuilderService {
         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/utils/EntitySearchUtils.java

@@ -4,10 +4,13 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Annota
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -26,10 +29,12 @@ public class EntitySearchUtils {
 
         if (details.getEntityType() == EntityType.RECOMMENDATION) {
             Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationsSearch(), details.withEntityType(EntityType.FALSE_RECOMMENDATION));
-            markFalsePositives(found, falseRecommendations);
+            removeFalsePositives(found, falseRecommendations);
+            found.addAll(falseRecommendations);
         } else {
             Set<Entity> falsePositives = find(inputString, type.getFalsePositiveSearch(), details.withEntityType(EntityType.FALSE_POSITIVE));
-            markFalsePositives(found, falsePositives);
+            removeFalsePositives(found, falsePositives);
+            found.addAll(falsePositives);
         }
 
         return found;
@@ -78,7 +83,7 @@ public class EntitySearchUtils {
             }
         }
 
-        if (manualRedactions != null && manualRedactions.getResizeRedactions() != null && !manualRedactions.getResizeRedactions().isEmpty()) {
+        if (manualRedactions != null && manualRedactions.getResizeRedactions() != null && !manualRedactions.getResizeRedactions().isEmpty()){
             applyResizeRedactions(entities, manualRedactions);
         }
 
@@ -88,35 +93,37 @@ public class EntitySearchUtils {
     }
 
 
-    private void applyResizeRedactions(Set<Entity> entitiesWithPositions, ManualRedactions manualRedactions) {
+    private Set<Entity> applyResizeRedactions(Set<Entity> entitiesWithPositions, ManualRedactions manualRedactions) {
 
-        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()) {
-            return;
+        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()){
+            return entitiesWithPositions;
         }
 
-        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());
-                        }
+        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());
                     }
-                })));
+                }
+            });
+        }));
 
+        return entitiesWithPositions;
     }
 
 
-    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) {
@@ -127,12 +134,8 @@ public class EntitySearchUtils {
                 }
             }
         }
-        wordsToRemove.forEach(e -> e.setFalsePositive(true));
-        for (var entity : entities) {
-            if (falsePositives.contains(entity)) {
-                entity.setFalsePositive(true);
-            }
-        }
+        wordsToRemove.forEach(entities::remove);
+        entities.removeAll(falsePositives);
     }
 
 
@@ -141,22 +144,13 @@ public class EntitySearchUtils {
         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.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 ||
+                    } else if(!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
                             inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
-                        if (inner.isResized()) {
+                        if(inner.isResized()){
                             wordsToRemove.add(word);
                         } else {
                             wordsToRemove.add(inner);

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

@@ -1,26 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -33,9 +12,28 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Slf4j
 @Service
@@ -74,7 +72,7 @@ public class PdfSegmentationService {
                 Document document = new Document();
                 List<Page> pages = new ArrayList<>();
 
-                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(67108864L));
+                pdDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupMixed(1024 * 1024 * 64));
                 pdDocument.setAllSecurityToBeRemoved(true);
                 long pageCount = pdDocument.getNumberOfPages();
 

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

@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.storage;
 
-import java.io.InputStream;
-
-import org.springframework.stereotype.Service;
-
+import com.dslplatform.json.DslJson;
+import com.dslplatform.json.runtime.Settings;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
@@ -20,12 +19,23 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class RedactionStorageService {
 
     private final StorageService storageService;
+    private final ObjectMapper objectMapper;
+
+    private final DslJson<Object> dslJson = new DslJson<>(Settings.basicSetup());
+
 
     @SneakyThrows
     public InputStream getStoredObject(String storageId) {
@@ -44,66 +54,148 @@ public class RedactionStorageService {
     @SneakyThrows
     @Timed("redactmanager_storeObject")
     public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
-        storageService.storeJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), any);
+
+        var bytes = serializeObject(any);
+        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), bytes);
     }
 
+
+    @SneakyThrows
+    @Timed("redactmanager_serializeObject")
+    private byte[] serializeObject(Object any) {
+
+            var baos = new ByteArrayOutputStream();
+            dslJson.serialize(any, baos);
+            return baos.toByteArray();
+        
+    }
+
+
     @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;
         }
+
+        return deserializeImportedRedactions(inputStreamResource);
+    }
+
+
+    @Timed("redactmanager_deserializeImportedRedactions")
+    private ImportedRedactions deserializeImportedRedactions(InputStreamResource inputStreamResource) {
+
+        try {
+            return dslJson.deserialize(ImportedRedactions.class, inputStreamResource.getInputStream());
+        } 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;
         }
 
+        return deserializeRedactionLog(inputStreamResource);
+    }
+
+
+    @Timed("redactmanager_deserializeRedactionLog")
+    private RedactionLog deserializeRedactionLog(InputStreamResource inputStreamResource) {
+
+        try {
+            return dslJson.deserialize(RedactionLog.class, inputStreamResource.getInputStream());
+        } 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;
         }
+
+        return deserializeText(inputStreamResource);
+    }
+
+
+    @Timed("redactmanager_deserializeText")
+    private Text deserializeText(InputStreamResource inputStreamResource) {
+
+        try {
+            return dslJson.deserialize(Text.class, inputStreamResource.getInputStream());
+        } 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.");
         }
+
+        return deserializeNerEntities(inputStreamResource);
     }
 
 
+    @Timed("redactmanager_deserializeNerEntities")
+    private NerEntities deserializeNerEntities(InputStreamResource inputStreamResource) {
+
+        try {
+            return dslJson.deserialize(NerEntities.class, inputStreamResource.getInputStream());
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert NER Entities", e);
+        }
+    }
+
 
     @Timed("redactmanager_getSectionGrid")
     public SectionGrid getSectionGrid(String dossierId, String fileId) {
 
+        InputStreamResource inputStreamResource;
         try {
-            return storageService.readJSONObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID),SectionGrid.class);
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
         } catch (StorageObjectDoesNotExist e) {
             throw new NotFoundException("Section Grid is not available.");
         }
+
+        return deserializeSectionGrid(inputStreamResource);
+    }
+
+
+    @Timed("redactmanager_deserializeSectionGrid")
+    private SectionGrid deserializeSectionGrid(InputStreamResource inputStreamResource) {
+
+        try {
+            return dslJson.deserialize(SectionGrid.class, inputStreamResource.getInputStream());
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert SectionGrid", e);
+        }
     }
 
 

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

@@ -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();

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

@@ -62,7 +62,7 @@ public class DictionaryServiceTest {
 
         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", "#cccccc",
                 "#cccccc", "#cccccc", "#cccccc", "#cccccc"));
 
         var type1 = new Type();

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

@@ -1,26 +1,20 @@
 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.*;
 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 implements StorageService{
 
     private final Map<String, File> dataMap = new HashMap<>();
 
@@ -54,51 +48,36 @@ public class FileSystemBackedStorageService implements StorageService {
 
     }
 
-    @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() {
+    public List<String> listPaths(){
         return new ArrayList<>(dataMap.keySet());
     }
 
 
-    public List<String> listFilePaths() {
+    public List<String> listFilePaths(){
         return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList());
     }
 
 
+    @SneakyThrows
+    @Override
+    public void storeObject(String objectId, byte[] data) {
+        File tempFile = File.createTempFile("storage", objectId.replace("/","-"));
+
+        IOUtils.write(data, new FileOutputStream(tempFile));
+
+        dataMap.put(objectId, tempFile);
+    }
+
     @Override
     @SneakyThrows
     public void storeObject(String objectId, InputStream stream) {
         File tempFile = File.createTempFile("test", ".tmp");
 
-        try (var fileOutputStream = new FileOutputStream(tempFile)) {
-            IOUtils.copy(stream, fileOutputStream);
-        }
+        IOUtils.copy(stream, 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

@@ -30,7 +30,10 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 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 +44,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;
@@ -91,7 +93,6 @@ 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;
@@ -219,26 +220,25 @@ public class RedactionIntegrationTest {
 
     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));
 
     }
 
@@ -330,36 +330,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
@@ -634,7 +604,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);
@@ -836,30 +807,6 @@ public class RedactionIntegrationTest {
     }
 
 
-    @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 {
 
@@ -884,63 +831,6 @@ public class RedactionIntegrationTest {
         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 {
@@ -983,9 +873,9 @@ public class RedactionIntegrationTest {
         var redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);
 
         AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
-                .manualRedactions(manualRedactions)
-                .colors(colors)
-                .types(types)
+                        .manualRedactions(manualRedactions)
+                        .colors(colors)
+                        .types(types)
                 .dossierId(TEST_DOSSIER_ID)
                 .fileId(TEST_FILE_ID)
                 .build());
@@ -1094,7 +984,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());
 
@@ -1564,15 +1454,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) {
 
@@ -1631,7 +1512,6 @@ public class RedactionIntegrationTest {
         typeColorMap.put(FORMULA, "#ffe187");
         typeColorMap.put(SIGNATURE, "#ffe187");
         typeColorMap.put(IMPORTED_REDACTION, "#fcfbe6");
-        typeColorMap.put(ROTATE_SIMPLE, "#66ccff");
 
         hintTypeMap.put(VERTEBRATE, true);
         hintTypeMap.put(ADDRESS, false);
@@ -1652,7 +1532,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 +1552,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 +1572,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 +1592,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 +1604,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 +1643,7 @@ public class RedactionIntegrationTest {
                 .build();
     }
 
+
     private String cleanDictionaryEntry(String entry) {
 
         return TextNormalizationUtilities.removeHyphenLineBreaks(entry).replaceAll("\\n", " ");
@@ -1772,8 +1651,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 -> {
@@ -1795,7 +1672,7 @@ public class RedactionIntegrationTest {
         ClassPathResource importedRedactions = new ClassPathResource("files/ImportedRedactions/RotateTestFile_without_highlights.IMPORTED_REDACTIONS.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);
@@ -1811,11 +1688,11 @@ public class RedactionIntegrationTest {
             if (entry.getValue() == null) {
                 return;
             }
-            if (entry.getValue().equals("David")) {
-                assertThat(entry.getImportedRedactionIntersections()).hasSize(1);
+            if (entry.getValue().equals("David")){
+                assertThat(entry.getImportedRedactionIntersections().size()).isEqualTo(1);
             }
-            if (entry.getValue().equals("annotation")) {
-                assertThat(entry.getImportedRedactionIntersections()).isEmpty();
+            if (entry.getValue().equals("annotation")){
+                assertThat(entry.getImportedRedactionIntersections().size()).isEqualTo(0);
             }
         });
 
@@ -1828,12 +1705,12 @@ public class RedactionIntegrationTest {
     @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";
@@ -1875,7 +1752,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/annotate/AnnotationService.java

@@ -1,15 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.annotate;
 
-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 com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -23,21 +22,12 @@ 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.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor

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

@@ -5,11 +5,9 @@ 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;
@@ -21,9 +19,6 @@ public class AnalyseFileRealDataIntegrationTest extends LiveDataIntegrationTest
 
     public static final String FILE_NAME = "test-file";
 
-    @Autowired
-    private AnnotationService annotationService;
-
     @Test
     @SneakyThrows
     public void testFile() {
@@ -86,19 +81,7 @@ public class AnalyseFileRealDataIntegrationTest extends LiveDataIntegrationTest
         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());
+        // var log = redactionStorageService.getRedactionLog("dossierId","fileId");
     }
 
-
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -36,7 +37,6 @@ 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;
@@ -114,8 +114,9 @@ public class LiveDataIntegrationTest {
         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 = objectMapper.treeToValue(jsonNode.get("types"), objectMapper.getTypeFactory().constructType(
+                new TypeReference<List<Type>>() {
+                }));
 
         types.forEach(t -> {
             t.setId(t.getType());
@@ -125,29 +126,27 @@ public class LiveDataIntegrationTest {
         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()) {
+            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 {
+            }else{
                 return null;
             }
         });
 
-        dictionaryService.updateDictionary("dossierTemplateId", "dossierId");
+        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);
 
@@ -155,7 +154,7 @@ public class LiveDataIntegrationTest {
             String typeName = answer.getArgument(0);
 
             var found = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst();
-            if (found.isPresent()) {
+            if(found.isPresent()) {
 
                 var type = types.stream().filter(t -> t.getType().equalsIgnoreCase(typeName)).findFirst().get();
 
@@ -166,7 +165,7 @@ public class LiveDataIntegrationTest {
                 }
 
                 return type;
-            } else {
+            }else{
                 return null;
             }
         });
@@ -175,20 +174,17 @@ public class LiveDataIntegrationTest {
 
     @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")) {
+            if (resource.getFilename().contains(typeName)) {
 
                 List<String> lines = IOUtils.readLines(resource.getInputStream());
                 return lines.stream().map(l -> new DictionaryEntry(0, l, 0L, false, typeId)).collect(Collectors.toList());
@@ -197,20 +193,4 @@ public class LiveDataIntegrationTest {
         }
         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.isAlpha(), imageMetadata.getPosition().getPageNumber()));
+        });
 
         System.out.println("object");
     }

redaction-service-v1/redaction-service-server-v1/src/test/resources/RedactionLog/files/Cyprodinil/39 Cyprodinil - EU AIR3 - Document F - Notification submitted to the Commission.json

@@ -1 +0,0 @@
-{"analysisVersion":1,"analysisNumber":0,"redactionLogEntry":[{"id":"12ac3d26ce82a77e469c64d56081662d","type":"CBI_author","value":"Micheletti S","reason":"Author found","matchedRule":1,"rectangle":false,"legalBasis":"Article 39(e)(3) of Regulation (EC) No 178/2002","imported":false,"redacted":true,"section":"Table in: COPY OF THE APPLICATION FOR RENEWAL, MADE UNDER COMMISSION","color":[1.0,0.88235295,0.5294118],"positions":[{"topLeft":{"x":214.8,"y":651.16003},"width":54.039078,"height":-11.520004,"page":4}],"sectionNumber":3,"textBefore":"Report: Document F/02, ","textAfter":". (2014). Cyprodinil","comments":[],"startOffset":23,"endOffset":35,"imageHasTransparency":false,"excluded":false,"sourceId":null,"changes":[{"analysisNumber":0,"type":"ADDED","dateTime":"2022-08-24T16:36:30.044122+02:00"}],"manualChanges":[],"engines":["DICTIONARY"],"reference":[],"importedRedactionIntersections":[],"hint":false,"recommendation":false,"falsePositive":false,"image":false,"dictionaryEntry":true,"dossierDictionaryEntry":false,"localManualRedaction":false,"manuallyRemoved":false},{"id":"dd614353319e7c5a8cf8b3346dc12fac","type":"CBI_author","value":"Micheletti S","reason":"Author found","matchedRule":1,"rectangle":false,"legalBasis":"Article 39(e)(3) of Regulation (EC) No 178/2002","imported":false,"redacted":true,"section":"COPY OF THE APPLICATION FOR RENEWAL, MADE UNDER COMMISSION","color":[1.0,0.88235295,0.5294118],"positions":[{"topLeft":{"x":306.84,"y":679.12},"width":59.71997,"height":-12.0,"page":4}],"sectionNumber":5,"textBefore":"F report (","textAfter":"., 2014).","comments":[],"startOffset":247,"endOffset":259,"imageHasTransparency":false,"excluded":false,"sourceId":null,"changes":[{"analysisNumber":0,"type":"ADDED","dateTime":"2022-08-24T16:36:30.044134+02:00"}],"manualChanges":[],"engines":["DICTIONARY"],"reference":[],"importedRedactionIntersections":[],"hint":false,"recommendation":false,"falsePositive":false,"image":false,"dictionaryEntry":true,"dossierDictionaryEntry":false,"localManualRedaction":false,"manuallyRemoved":false}],"legalBasis":[],"dictionaryVersion":0,"dossierDictionaryVersion":0,"rulesVersion":0,"legalBasisVersion":0}