RED-2845 Bugfix: Avoid the expansion if it would result in a redaction overlap and bugfix in RegExp in drools

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

@@ -3,12 +3,6 @@ set -e
 
 SERVICE_NAME=$1
 
-${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean install \
-    -Djava.security.egd=file:/dev/./urandomelse
-
 echo "dependency-check:aggregate"
 ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
     --no-transfer-progress \

redaction-service-image-v1/pom.xml

@@ -6,7 +6,6 @@
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-docker-dependency</artifactId>
         <version>1.1.0</version>
-        <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

redaction-service-image-v1/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM red/redaction-service-base-v1:1.0.0
+FROM red/base-image:1.0.0
 
 ARG PLATFORM_JAR
 
@@ -7,3 +7,12 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 ENV USES_ELASTICSEARCH false
 
 COPY ["${PLATFORM_JAR}", "/"]
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    wget cabextract xfonts-utils fonts-liberation \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN curl http://ftp.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.8_all.deb -o /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && dpkg -i /tmp/ttf-mscorefonts-installer_3.8_all.deb \
+ && rm /tmp/ttf-mscorefonts-installer_3.8_all.deb \

redaction-service-v1/pom.xml

@@ -5,8 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.6.0</version>
-        <relativePath />
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +31,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.11.0</version>
+                <version>1.7.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.85.0</persistence-service.version>
+        <persistence-service.version>0.121.0</persistence-service.version>
     </properties>
 
     <dependencies>

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

@@ -1,17 +1,17 @@
 package com.iqser.red.service.redaction.v1.model;
 
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
 @Builder
@@ -19,14 +19,12 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AnalyzeRequest {
 
-    private MessageType messageType;
-
     private String dossierId;
     private String fileId;
     private String dossierTemplateId;
+    private boolean reanalyseOnlyIfPossible;
     private ManualRedactions manualRedactions;
     private OffsetDateTime lastProcessed;
-    private int analysisNumber;
 
     @Builder.Default
     private Set<Integer> excludedPages = new HashSet<>();

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

@@ -1,7 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AnalyzeResult {
 
-    private MessageType messageType;
-
     private String dossierId;
     private String fileId;
     private long duration;
@@ -28,9 +24,6 @@ public class AnalyzeResult {
     private boolean wasReanalyzed;
 
     private int analysisVersion;
-    private int analysisNumber;
-
-    private ManualRedactions manualRedactions;
 
 
 }

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

@@ -13,7 +13,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class Change {
 
-    private int analysisNumber;
     private ChangeType type;
     private OffsetDateTime dateTime;
 }

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

@@ -1,21 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ImportedRedaction {
-
-    private String id;
-
-    @Builder.Default
-    private List<Rectangle> positions = new ArrayList<>();
-}

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

@@ -1,20 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ImportedRedactions {
-
-    @Builder.Default
-    private Map<Integer, List<ImportedRedaction>> importedRedactions = new HashMap<>();
-}

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

@@ -1,50 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.BaseAnnotation;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ManualChange {
-
-    private AnnotationStatus annotationStatus;
-    private ManualRedactionType manualRedactionType;
-    private OffsetDateTime processedDate;
-    private OffsetDateTime requestedDate;
-    private String userId;
-    private Map<String, Object> propertyChanges = new HashMap<>();
-
-    public boolean isProcessed() {
-        return processedDate != null;
-    }
-
-    public static ManualChange from(BaseAnnotation baseAnnotation) {
-        ManualChange manualChange = new ManualChange();
-        manualChange.annotationStatus = baseAnnotation.getStatus();
-        manualChange.processedDate = baseAnnotation.getProcessedDate();
-        manualChange.requestedDate = baseAnnotation.getRequestDate();
-        manualChange.userId = baseAnnotation.getUser();
-        return manualChange;
-    }
-
-    public ManualChange withManualRedactionType(ManualRedactionType manualRedactionType) {
-        this.manualRedactionType = manualRedactionType;
-        return this;
-    }
-
-    public ManualChange withChange(String property, Object value) {
-        this.propertyChanges.put(property, value);
-        return this;
-    }
-
-}

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

@@ -1,13 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
 public enum ManualRedactionType {
-    ADD_LOCALLY,
-    ADD_TO_DICTIONARY,
-    REMOVE_LOCALLY,
-    REMOVE_FROM_DICTIONARY,
-    FORCE_REDACT,
-    FORCE_HINT,
-    RECATEGORIZE,
-    LEGAL_BASIS_CHANGE,
-    RESIZE
+    ADD, REMOVE, FORCE_REDACT, RECATEGORIZE, LEGAL_BASIS_CHANGE, RESIZE
 }

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

@@ -1,7 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum MessageType {
-
-    ANALYSE, REANALYSE, STRUCTURE_ANALYSE, SURROUNDING_TEXT
-
-}

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

@@ -18,11 +18,6 @@ public class RedactionLog {
      */
     private long analysisVersion;
 
-    /**
-     * Which analysis created this redactionLog.
-     */
-    private int analysisNumber;
-
     private List<RedactionLogEntry> redactionLogEntry;
     private List<LegalBasis> legalBasis;
 
@@ -31,5 +26,4 @@ public class RedactionLog {
     private long rulesVersion = -1;
     private long legalBasisVersion = -1;
 
-
 }

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

@@ -2,9 +2,16 @@ package com.iqser.red.service.redaction.v1.model;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 
 @Data
@@ -21,13 +28,15 @@ public class RedactionLogEntry {
     private int matchedRule;
     private boolean rectangle;
     private String legalBasis;
-
-    private boolean imported;
-
     private boolean redacted;
     private boolean isHint;
     private boolean isRecommendation;
-    private boolean isFalsePositive;
+
+    private boolean hasBeenResized;
+    private boolean hasBeenRecategorized;
+    private boolean hasLegalBasisChanged;
+    private boolean hasBeenForced;
+    private boolean hasBeenRemovedByManualOverride;
 
     private String section;
     private float[] color;
@@ -35,7 +44,11 @@ public class RedactionLogEntry {
     @Builder.Default
     private List<Rectangle> positions = new ArrayList<>();
     private int sectionNumber;
-
+    private boolean manual;
+    private AnnotationStatus status;
+    private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
+    private boolean isDictionaryEntry;
 
     private String textBefore;
     private String textAfter;
@@ -49,39 +62,21 @@ public class RedactionLogEntry {
     private boolean isImage;
     private boolean imageHasTransparency;
 
-    private boolean isDictionaryEntry;
     private boolean isDossierDictionaryEntry;
 
     private boolean excluded;
 
+    private String recategorizationType;
+    private String legalBasisChangeValue;
+
     @EqualsAndHashCode.Exclude
     @Builder.Default
     private List<Change> changes = new ArrayList<>();
 
-    @EqualsAndHashCode.Exclude
-    @Builder.Default
-    private List<ManualChange> manualChanges = new ArrayList<>();
-
-    private Set<Engine> engines = new HashSet<>();
+    private Set<Engine> engines= new HashSet<>();
 
     private Set<String> reference = new HashSet<>();
 
-    public boolean lastChangeIsRemoved() {
-        return last(changes).map(c -> c.getType() == ChangeType.REMOVED).orElse(false);
-    }
 
-    public boolean isLocalManualRedaction() {
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY &&
-                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
-    }
-
-    public boolean isManuallyRemoved() {
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY &&
-                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
-    }
-
-    private <T> Optional<T> last(List<T> list) {
-        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(list.size() - 1));
-    }
 
 }

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

@@ -1,15 +1,10 @@
 package com.iqser.red.service.redaction.v1.model;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,9 +22,4 @@ public class RedactionRequest {
     private ManualRedactions manualRedactions;
     @Builder.Default
     private Set<Integer> excludedPages = new HashSet<>();
-
-    private Colors colors;
-    private List<Type> types;
-
-    private boolean includeFalsePositives;
 }

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

@@ -30,9 +30,4 @@ public class SectionArea {
         return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
     }
 
-    // TODO we should only use one rectangle class.
-    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
-    }
-
 }

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

@@ -1,43 +1,29 @@
 package com.iqser.red.service.redaction.v1.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.*;
-
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 public interface RedactionResource {
 
     @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
 
-
     @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult sections(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
 
-
     @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
     void testRules(@RequestBody String rules);
 
-
     @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
 
-
-    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
-                                        @PathVariable("fileId") String fileId,
-                                        @RequestBody ManualRedactions manualRedactions);
-
 }

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -17,7 +16,7 @@ public class Page {
     @NonNull
     private List<AbstractTextContainer> textBlocks;
 
-    private List<PdfImage> images = new ArrayList<>();
+    private List<PdfImage> images;
 
     private Rectangle bodyTextFrame;
 

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

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

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

@@ -1,9 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import com.iqser.red.service.redaction.v1.server.client.model.EntityRecogintionEntity;
 import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 
@@ -12,5 +16,4 @@ public interface EntityRecognitionClient {
 
     @PostMapping(value = "/find_authors", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     NerEntities findAuthors(EntityRecognitionRequest entityRecognitionRequest);
-
 }

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

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.multipart.MultipartFile;
+
+@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
+public interface ImageClassificationClient {
+
+    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ImageClassificationResponse classify(@RequestBody MultipartFile file);
+
+}

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

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageClassificationResponse {
+
+    private String category;
+}

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

@@ -16,6 +16,6 @@ import lombok.NoArgsConstructor;
 public class NerEntities {
 
    @Builder.Default
-   private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
+   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
 
 }

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

@@ -1,24 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -27,16 +10,22 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+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
@@ -50,18 +39,11 @@ public class RedactionController implements RedactionResource {
     private final PdfSegmentationService pdfSegmentationService;
     private final RedactionStorageService redactionStorageService;
     private final RedactionLogMergeService redactionLogMergeService;
-    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
-
 
     public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
         var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder()
-                .fileId(annotateRequest.getFileId())
-                .manualRedactions(annotateRequest.getManualRedactions())
-                .dossierId(annotateRequest.getDossierId())
-                .dossierTemplateId(annotateRequest.getDossierTemplateId())
-                .build());
+        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder().fileId(annotateRequest.getFileId()).manualRedactions(annotateRequest.getManualRedactions()).dossierId(annotateRequest.getDossierId()).dossierTemplateId(annotateRequest.getDossierTemplateId()).build());
         var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());
 
         try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
@@ -83,10 +65,9 @@ public class RedactionController implements RedactionResource {
 
     @Override
     public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
-
         var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
         try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
             storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
@@ -104,15 +85,14 @@ public class RedactionController implements RedactionResource {
             throw new RedactionException(e);
         }
 
-    }
 
+    }
 
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-
         var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
         try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
             storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
@@ -129,6 +109,7 @@ public class RedactionController implements RedactionResource {
             throw new RedactionException(e);
         }
 
+
     }
 
 
@@ -139,11 +120,12 @@ public class RedactionController implements RedactionResource {
 
         try {
             var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
         } catch (Exception e) {
             throw new RedactionException(e);
         }
 
+
         StringBuilder sb = new StringBuilder();
         for (Page page : classifiedDoc.getPages()) {
             for (AbstractTextContainer textContainer : page.getTextBlocks()) {
@@ -158,18 +140,17 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public void testRules(@RequestBody String rules) {
 
         droolsExecutionService.testRules(rules);
     }
 
-
     @Override
     public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {
 
-        log.debug("Requested preview for: {}", redactionRequest);
+        log.info("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
 
         var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
 
@@ -187,24 +168,24 @@ public class RedactionController implements RedactionResource {
 
             // enhance section grid with headline data
             for (var sectionText : text.getSectionTexts()) {
-                sectionGrid.getSections()
-                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
-                                .stream()
-                                .map(SectionArea::getPage)
-                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
+                sectionGrid.getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                        sectionText.getHeadline(),
+                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                        sectionText.getSectionAreas()));
             }
             redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
         }
 
+
         log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-        var merged = redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages(), redactionRequest.getTypes(), redactionRequest.getColors());
-
-        merged.getRedactionLogEntry().removeIf(e -> e.isFalsePositive() && !redactionRequest.isIncludeFalsePositives());
-
-        return merged;
+        if (redactionLog.getAnalysisVersion() == 0) {
+            // old redaction logs are returned directly
+            return redactionLog;
+        } else {
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+        }
     }
 
-
     private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
@@ -218,14 +199,4 @@ public class RedactionController implements RedactionResource {
     }
 
 
-    @Override
-    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());
-        return result.getManualRedactions();
-    }
-
 }

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

@@ -1,377 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.iqser.red.service.redaction.v1.server.parsing;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.fontbox.ttf.TrueTypeFont;
-import org.apache.fontbox.util.BoundingBox;
-
-import org.apache.pdfbox.contentstream.PDFStreamEngine;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDCIDFont;
-import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
-import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
-import org.apache.pdfbox.pdmodel.font.PDType0Font;
-import org.apache.pdfbox.pdmodel.font.PDType3Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.pdfbox.util.Matrix;
-import org.apache.pdfbox.util.Vector;
-import org.apache.pdfbox.contentstream.operator.DrawObject;
-import org.apache.pdfbox.contentstream.operator.state.Concatenate;
-import org.apache.pdfbox.contentstream.operator.state.Restore;
-import org.apache.pdfbox.contentstream.operator.state.Save;
-import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
-import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
-import org.apache.pdfbox.contentstream.operator.text.BeginText;
-import org.apache.pdfbox.contentstream.operator.text.EndText;
-import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
-import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
-import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
-import org.apache.pdfbox.contentstream.operator.text.MoveText;
-import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
-import org.apache.pdfbox.contentstream.operator.text.NextLine;
-import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
-import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
-import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
-import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
-import org.apache.pdfbox.contentstream.operator.text.ShowText;
-import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
-
-/**
- * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
- *
- * This class exists only so that we don't break the code of users who have their own subclasses of
- * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
- * with a heuristic implementation which is backwards compatible.
- *
- * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
- * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
- */
-@SuppressWarnings({"PMD", "checkstyle:all"})
-class LegacyPDFStreamEngine extends PDFStreamEngine
-{
-    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
-
-    private int pageRotation;
-    private PDRectangle pageSize;
-    private Matrix translateMatrix;
-    private final GlyphList glyphList;
-    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
-
-    /**
-     * Constructor.
-     */
-    LegacyPDFStreamEngine() throws IOException
-    {
-        addOperator(new BeginText());
-        addOperator(new Concatenate());
-        addOperator(new DrawObject()); // special text version
-        addOperator(new EndText());
-        addOperator(new SetGraphicsStateParameters());
-        addOperator(new Save());
-        addOperator(new Restore());
-        addOperator(new NextLine());
-        addOperator(new SetCharSpacing());
-        addOperator(new MoveText());
-        addOperator(new MoveTextSetLeading());
-        addOperator(new SetFontAndSize());
-        addOperator(new ShowText());
-        addOperator(new ShowTextAdjusted());
-        addOperator(new SetTextLeading());
-        addOperator(new SetMatrix());
-        addOperator(new SetTextRenderingMode());
-        addOperator(new SetTextRise());
-        addOperator(new SetWordSpacing());
-        addOperator(new SetTextHorizontalScaling());
-        addOperator(new ShowTextLine());
-        addOperator(new ShowTextLineAndSpace());
-
-        // load additional glyph list for Unicode mapping
-        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
-        InputStream input = GlyphList.class.getResourceAsStream(path);
-        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
-    }
-
-    /**
-     * This will initialize and process the contents of the stream.
-     *
-     * @param page the page to process
-     * @throws java.io.IOException if there is an error accessing the stream.
-     */
-    @Override
-    public void processPage(PDPage page) throws IOException
-    {
-        this.pageRotation = page.getRotation();
-        this.pageSize = page.getCropBox();
-
-        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0)
-        {
-            translateMatrix = null;
-        }
-        else
-        {
-            // translation matrix for cropbox
-            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
-        }
-        super.processPage(page);
-    }
-
-    /**
-     * Called when a glyph is to be processed. The heuristic calculations here were originally
-     * written by Ben Litchfield for PDFStreamEngine.
-     */
-    @Override
-    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code,
-            String unicode,
-            Vector displacement)
-            throws IOException
-    {
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        PDGraphicsState state = getGraphicsState();
-        Matrix ctm = state.getCurrentTransformationMatrix();
-        float fontSize = state.getTextState().getFontSize();
-        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
-        Matrix textMatrix = getTextMatrix();
-
-        float displacementX = displacement.getX();
-        // the sorting algorithm is based on the width of the character. As the displacement
-        // for vertical characters doesn't provide any suitable value for it, we have to 
-        // calculate our own
-        if (font.isVertical())
-        {
-            displacementX = font.getWidth(code) / 1000;
-            // there may be an additional scaling factor for true type fonts
-            TrueTypeFont ttf = null;
-            if (font instanceof PDTrueTypeFont)
-            {
-                ttf = ((PDTrueTypeFont)font).getTrueTypeFont();
-            }
-            else if (font instanceof PDType0Font)
-            {
-                PDCIDFont cidFont = ((PDType0Font)font).getDescendantFont();
-                if (cidFont instanceof PDCIDFontType2)
-                {
-                    ttf = ((PDCIDFontType2)cidFont).getTrueTypeFont();
-                }
-            }
-            if (ttf != null && ttf.getUnitsPerEm() != 1000)
-            {
-                displacementX *= 1000f / ttf.getUnitsPerEm();
-            }
-        }
-
-        //
-        // legacy calculations which were previously in PDFStreamEngine
-        //
-        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
-        //  THIS CODE IS DELIBERATELY INCORRECT
-        //
-
-        // (modified) combined displacement, this is calculated *without* taking the character
-        // spacing and word spacing into account, due to legacy code in TextStripper
-        float tx = displacementX * fontSize * horizontalScaling;
-        float ty = displacement.getY() * fontSize;
-
-        // (modified) combined displacement matrix
-        Matrix td = Matrix.getTranslateInstance(tx, ty);
-
-        // (modified) text rendering matrix
-        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
-        float nextX = nextTextRenderingMatrix.getTranslateX();
-        float nextY = nextTextRenderingMatrix.getTranslateY();
-
-        // (modified) width and height calculations
-        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
-        Float fontHeight = fontHeightMap.get(font.getCOSObject());
-        if (fontHeight == null)
-        {
-            fontHeight = computeFontHeight(font);
-            fontHeightMap.put(font.getCOSObject(), fontHeight);
-        }
-        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
-
-        //
-        // start of the original method
-        //
-
-        // Note on variable names. There are three different units being used in this code.
-        // Character sizes are given in glyph units, text locations are initially given in text
-        // units, and we want to save the data in display units. The variable names should end with
-        // Text or Disp to represent if the values are in text or disp units (no glyph units are
-        // saved).
-
-        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
-        if (font instanceof PDType3Font)
-        {
-            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
-        }
-
-        float spaceWidthText = 0;
-        try
-        {
-            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
-            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
-        }
-        catch (Throwable exception)
-        {
-            LOG.warn(exception, exception);
-        }
-
-        if (spaceWidthText == 0)
-        {
-            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
-            // the average space width appears to be higher than necessary so make it smaller
-            spaceWidthText *= .80f;
-        }
-        if (spaceWidthText == 0)
-        {
-            spaceWidthText = 1.0f; // if could not find font, use a generic value
-        }
-
-        // the space width has to be transformed into display units
-        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
-
-        // use our additional glyph list for Unicode mapping
-        String unicodeMapping = font.toUnicode(code, glyphList);
-
-        // when there is no Unicode mapping available, Acrobat simply coerces the character code
-        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
-        // this, which is why we leave it until this point in PDFTextStreamEngine.
-        if (unicodeMapping == null)
-        {
-            if (font instanceof PDSimpleFont)
-            {
-                char c = (char) code;
-                unicodeMapping = new String(new char[] { c });
-            }
-            else
-            {
-                // Acrobat doesn't seem to coerce composite font's character codes, instead it
-                // skips them. See the "allah2.pdf" TestTextStripper file.
-                return;
-            }
-        }
-
-        // adjust for cropbox if needed
-        Matrix translatedTextRenderingMatrix;
-        if (translateMatrix == null)
-        {
-            translatedTextRenderingMatrix = textRenderingMatrix;
-        }
-        else
-        {
-            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
-            nextX -= pageSize.getLowerLeftX();
-            nextY -= pageSize.getLowerLeftY();
-        }
-
-        processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
-                pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
-                Math.abs(dyDisplay), dxDisplay,
-                Math.abs(spaceWidthDisplay), unicodeMapping, new int[] { code }, font,
-                fontSize,
-                (int)(fontSize * textMatrix.getScalingFactorX())));
-    }
-
-    /**
-     * Compute the font height. Override this if you want to use own calculations.
-     * 
-     * @param font the font.
-     * @return the font height.
-     * 
-     * @throws IOException if there is an error while getting the font bounding box.
-     */
-    protected float computeFontHeight(PDFont font) throws IOException
-    {
-        BoundingBox bbox = font.getBoundingBox();
-        if (bbox.getLowerLeftY() < Short.MIN_VALUE)
-        {
-            // PDFBOX-2158 and PDFBOX-3130
-            // files by Salmat eSolutions / ClibPDF Library
-            bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536));
-        }
-        // 1/2 the bbox is used as the height todo: why?
-        float glyphHeight = bbox.getHeight() / 2;
-
-        // sometimes the bbox has very high values, but CapHeight is OK
-        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
-        if (fontDescriptor != null)
-        {
-            float capHeight = fontDescriptor.getCapHeight();
-            if (Float.compare(capHeight, 0) != 0 &&
-                    (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0))
-            {
-                glyphHeight = capHeight;
-            }
-            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
-            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
-            float ascent = fontDescriptor.getAscent();
-            float descent = fontDescriptor.getDescent();
-            if (capHeight > ascent && ascent > 0 && descent < 0 &&
-                    ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0))
-            {
-                glyphHeight = (ascent - descent) / 2;
-            }
-        }
-
-        // transformPoint from glyph space -> text space
-        float height;
-        if (font instanceof PDType3Font)
-        {
-            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
-        }
-        else
-        {
-            height = glyphHeight / 1000;
-        }
-
-        return height;
-    }
-
-    /**
-     * A method provided as an event interface to allow a subclass to perform some specific
-     * functionality when text needs to be processed.
-     *
-     * @param text The text to be processed.
-     */
-    protected void processTextPosition(TextPosition text)
-    {
-        // subclasses can override to provide specific functionality
-    }
-}

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

@@ -36,6 +36,7 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;
 
@@ -124,9 +125,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
                     // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                     if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
+                                .getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
+                                .getX(), path_y)));
                     }
 
                     path_x = (float) pos.getX();
@@ -147,19 +150,25 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                     Point2D p2 = transformPosition(x + width, y + height);
 
                     // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                            .getX(), (float) p2.getY())));
 
                     // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                     if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p2.getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
+                                .getX(), (float) p1.getY())));
                     }
                     if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p2.getY())));
                     } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
+                                .getX(), (float) p1.getY())));
                     }
                 }
                 break;
@@ -183,9 +192,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 graphicsPath.clear();
                 break;
 
-//            case OperatorName.DRAW_OBJECT:
-//                processImageOperation(arguments);
-//                break;
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
 
         }
 
@@ -202,7 +211,8 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 PDImageXObject image = (PDImageXObject) xobject;
                 Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();
 
-                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew
+                        .getScaleY());
 
                 // Memory Hack - sofReference kills me
                 FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);
@@ -285,7 +295,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
             if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                     .getUnicode()
-                    .equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t"))) {
                 startIndex++;
                 continue;
             }
@@ -295,9 +307,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
@@ -308,9 +318,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
@@ -324,9 +332,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
                 if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                         .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
-                        .getUnicode()
-                        .equals("\t")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
 
                     // Remove false sequence ends (whitespaces)
                     if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
@@ -345,15 +351,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
         if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                 .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1)
-                .getUnicode()
-                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
             sublist = sublist.subList(0, sublist.size() - 1);
         }
 
         if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                 .getUnicode()
-                .equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+                .equals("\u00A0") || sublist.get(0)
+                .getUnicode()
+                .equals("\t")))) {
             if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
                     .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
                 for (TextPosition t : sublist) {

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

@@ -1,24 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.pdfbox.text.TextPosition;
+import static java.util.stream.Collectors.toSet;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.text.TextPosition;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
-@Slf4j
 @Data
 @NoArgsConstructor
-@JsonIgnoreProperties({"empty"})
+@JsonIgnoreProperties({ "empty" })
 public class TextPositionSequence implements CharSequence {
 
     private int page;
@@ -27,15 +25,12 @@ public class TextPositionSequence implements CharSequence {
     private float x1;
     private float x2;
 
-
     public TextPositionSequence(int page) {
-
         this.page = page;
     }
 
 
     public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
-
         var textPositionSequence = new TextPositionSequence();
         textPositionSequence.textPositions = textPositions;
         textPositionSequence.page = page;
@@ -51,6 +46,9 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
+
+
+
     @Override
     public int length() {
 
@@ -133,7 +131,6 @@ public class TextPositionSequence implements CharSequence {
         }
     }
 
-
     @JsonIgnore
     public float getRotationAdjustedY() {
 
@@ -193,8 +190,10 @@ public class TextPositionSequence implements CharSequence {
 
     @JsonIgnore
     public String getFont() {
-
-        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
+        return textPositions.get(0).getFontName()
+                .toLowerCase()
+                .replaceAll(",bold", "")
+                .replaceAll(",italic", "");
     }
 
 
@@ -215,33 +214,27 @@ public class TextPositionSequence implements CharSequence {
 
     }
 
-
     @JsonIgnore
     public float getFontSize() {
 
         return textPositions.get(0).getFontSizeInPt();
     }
 
-
     @JsonIgnore
     public float getSpaceWidth() {
 
         return textPositions.get(0).getWidthOfSpace();
     }
 
-
     @JsonIgnore
     public int getRotation() {
 
         return textPositions.get(0).getRotation();
     }
 
-
     @JsonIgnore
     public Rectangle getRectangle() {
 
-        log.debug("Page: '{}', Word: '{}', Rotation: '{}'", page, toString(), textPositions.get(0).getRotation());
-
         float height = getTextHeight();
 
         float posXInit = getX1();
@@ -253,45 +246,36 @@ public class TextPositionSequence implements CharSequence {
             posXEnd = textPositions.get(0).getYDirAdj() + 2;
             posYInit = getY1();
             posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
+        } else if (textPositions.get(0).getRotation() == 270) {
             posYInit = textPositions.get(0).getPageHeight() - getX1();
             posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
                     .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
             posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
             posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                     .getYDirAdj() + height;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = posYInit + 1;
-            posXInit = textPositions.get(0).getXDirAdj();
-            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+        } 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)
+        } else if(textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f){
+            posXInit =  textPositions.get(textPositions.size() - 1)
                     .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
             posXEnd = textPositions.get(0).getXDirAdj();
             posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
             posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
                     .getYDirAdj() + 2;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
-            posYInit = getX1();
-            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
-                    .getWidthDirAdj() - 3;
-            posXInit = textPositions.get(0).getYDirAdj() + 2;
-            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
-
-        } else {
+        } else if(textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f){
+            posYInit =  getX1();
+            posYEnd =   getX2() + textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit =  textPositions.get(0).getYDirAdj() + 2;
+            posXEnd =  textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() - height;
+        }
+        else {
             posXEnd = textPositions.get(textPositions.size() - 1)
                     .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
             posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
@@ -299,9 +283,7 @@ public class TextPositionSequence implements CharSequence {
                     .getYDirAdj() + 2;
         }
 
-        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
-        log.debug("Rectangle: {}", rectangle);
-        return rectangle;
+        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
     }
 
 }

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

@@ -1,25 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.queue;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
-
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RequiredArgsConstructor
-public class MessageReceiver {
-
-    private final RedactionMessageReceiver redactionMessageReceiver;
-
-    @RabbitHandler
-    @RabbitListener(queues = REDACTION_QUEUE)
-    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
-        redactionMessageReceiver.receiveAnalyzeRequest(in, false);
-    }
-
-}

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

@@ -1,10 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.queue;
 
 import lombok.RequiredArgsConstructor;
-
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.QueueBuilder;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -12,24 +10,11 @@ import org.springframework.context.annotation.Configuration;
 @RequiredArgsConstructor
 public class MessagingConfiguration {
 
+
     public static final String REDACTION_QUEUE = "redactionQueue";
+
     public static final String REDACTION_DQL = "redactionDQL";
 
-    public static final String REDACTION_PRIORITY_QUEUE = "redactionPriorityQueue";
-
-    @Bean
-    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false")
-    public MessageReceiver messageReceiver(RedactionMessageReceiver redactionMessageReceiver){
-        return new MessageReceiver(redactionMessageReceiver);
-    }
-
-
-    @Bean
-    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "true")
-    public PriorityMessageReceiver priorityMessageReceiver(RedactionMessageReceiver redactionMessageReceiver){
-        return new PriorityMessageReceiver(redactionMessageReceiver);
-    }
-
 
     @Bean
     public Queue redactionQueue() {
@@ -42,21 +27,9 @@ public class MessagingConfiguration {
     }
 
 
-    @Bean
-    public Queue redactionPriorityQueue() {
-
-        return QueueBuilder.durable(REDACTION_PRIORITY_QUEUE)
-                .withArgument("x-dead-letter-exchange", "")
-                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
-                .maxPriority(2)
-                .build();
-    }
-
-
     @Bean
     public Queue redactionDeadLetterQueue() {
 
         return QueueBuilder.durable(REDACTION_DQL).build();
     }
-
 }

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

@@ -1,27 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.queue;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_PRIORITY_QUEUE;
-
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@RequiredArgsConstructor
-public class PriorityMessageReceiver {
-
-    private final RedactionMessageReceiver redactionMessageReceiver;
-
-
-    @RabbitHandler
-    @RabbitListener(queues = REDACTION_PRIORITY_QUEUE)
-    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
-
-        redactionMessageReceiver.receiveAnalyzeRequest(in, true);
-    }
-
-}

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

@@ -1,12 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.queue;
 
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
-
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
@@ -14,11 +7,18 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
 import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.NerAnalyserService;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -27,39 +27,31 @@ public class RedactionMessageReceiver {
     private final ObjectMapper objectMapper;
     private final AnalyzeService analyzeService;
     private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
-    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
+    private final NerAnalyserService nerAnalyserService;
 
 
-    public void receiveAnalyzeRequest(String in, boolean priority) throws JsonProcessingException {
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_QUEUE)
+    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
 
         var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
-        AnalyzeResult result = null;
+        log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
+        AnalyzeResult result;
+        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
+            result = analyzeService.reanalyze(analyzeRequest);
+            log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+        } else {
+            // TODO Seperate stucture analysis by other queue
+            analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
-        switch (analyzeRequest.getMessageType()) {
+            // TODO NerEntities should be computed and stored in entity-recognition-service, should be triggered by a seperate queue after structure analysis
+            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
 
-            case REANALYSE:
-                result = analyzeService.reanalyze(analyzeRequest);
-                log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
-
-            case STRUCTURE_ANALYSE:
-                result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
-                log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
-
-            case ANALYSE:
-                result = analyzeService.analyze(analyzeRequest);
-                log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
-
-            case SURROUNDING_TEXT:
-                result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
-                log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
+            result = analyzeService.analyze(analyzeRequest);
+            log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result
+                    .getDuration());
         }
 
-        result.setMessageType(analyzeRequest.getMessageType());
         fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
     }
 

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

@@ -1,16 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import static java.util.stream.Collectors.toSet;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
+import lombok.Data;
+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import lombok.Data;
-import lombok.Getter;
 
 @Data
 public class Dictionary {
 
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
     @Getter
     private List<DictionaryModel> dictionaryModels;
     private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
@@ -20,7 +26,6 @@ public class Dictionary {
 
 
     public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
-
         this.dictionaryModels = dictionaryModels;
         this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
         this.version = version;
@@ -28,7 +33,6 @@ public class Dictionary {
 
 
     public int getDictionaryRank(String type) {
-
         if (!localAccessMap.containsKey(type)) {
             return 0;
         }
@@ -36,6 +40,16 @@ public class Dictionary {
     }
 
 
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
     public boolean hasLocalEntries() {
 
         return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
@@ -48,18 +62,16 @@ public class Dictionary {
     }
 
 
-    public DictionaryModel getType(String type) {
-
-        return localAccessMap.get(type);
-    }
-
-
     public boolean containsValue(String type, String value) {
 
         return localAccessMap.containsKey(type) && localAccessMap.get(type)
                 .getValues(false)
                 .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
                 .getValues(true)
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getValues(false)
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getValues(true)
                 .contains(value);
     }
 
@@ -73,7 +85,6 @@ public class Dictionary {
         return false;
     }
 
-
     public boolean isCaseInsensitiveDictionary(String type) {
 
         DictionaryModel dictionaryModel = localAccessMap.get(type);

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

@@ -1,26 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class DictionaryEntries {
-
-    @Builder.Default
-    Set<DictionaryEntry> entries = new HashSet<>();
-    @Builder.Default
-    Set<DictionaryEntry> falsePositives = new HashSet<>();
-    @Builder.Default
-    Set<DictionaryEntry> falseRecommendations = new HashSet<>();
-
-}

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

@@ -19,9 +19,8 @@ public class DictionaryModel implements Serializable {
     private float[] color;
     private boolean caseInsensitive;
     private boolean hint;
+    private boolean recommendation;
     private Set<DictionaryEntry> entries;
-    private Set<DictionaryEntry> falsePositives;
-    private Set<DictionaryEntry> falseRecommendations;
     private Set<String> localEntries;
     private boolean isDossierDictionary;
 
@@ -30,14 +29,4 @@ public class DictionaryModel implements Serializable {
                 .toSet());
     }
 
-    public Set<String> getFalsePositiveValues() {
-        return falsePositives.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors
-                .toSet());
-    }
-
-    public Set<String> getFalseRecommendationValues() {
-        return falseRecommendations.stream().filter(e -> !e.isDeleted()).map(e -> e.getValue()).collect(Collectors
-                .toSet());
-    }
-
 }

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

@@ -1,23 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Entities {
-
-    @Builder.Default
-    private Set<Entity> entities = new HashSet<>();
-
-    @Builder.Default
-    private Set<Entity> nerEntities = new HashSet<>();
-
-}

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

@@ -15,8 +15,8 @@ import java.util.Set;
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity implements ReasonHolder {
 
-    private String word;
-    private String type;
+    private final String word;
+    private final String type;
     private boolean redaction;
     private String redactionReason;
     private String legalBasis;
@@ -42,19 +42,15 @@ public class Entity implements ReasonHolder {
 
     private boolean isDossierDictionaryEntry;
 
-    private boolean ignored;
-
     private Set<Engine> engines = new HashSet<>();
 
     private Set<Entity> references = new HashSet<>();
 
-    private EntityType entityType;
-
 
     public Entity(String word, String type, boolean redaction, String redactionReason,
                   List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,
                   String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start,
-                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references, EntityType entityType) {
+                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references) {
 
         this.word = word;
         this.type = type;
@@ -73,12 +69,11 @@ public class Entity implements ReasonHolder {
         this.isDossierDictionaryEntry = isDossierDictionaryEntry;
         this.engines = engines;
         this.references = references;
-        this.entityType = entityType;
     }
 
 
     public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
-                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine, EntityType entityType) {
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine) {
 
         this.word = word;
         this.type = type;
@@ -89,7 +84,6 @@ public class Entity implements ReasonHolder {
         this.isDictionaryEntry = isDictionaryEntry;
         this.isDossierDictionaryEntry = isDossierDictionaryEntry;
         this.engines.add(engine);
-        this.entityType = entityType;
     }
 
 

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

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

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

@@ -20,7 +20,6 @@ public class Image implements ReasonHolder {
     private int sectionNumber;
     private String section;
     private int page;
-    private boolean ignored;
     private boolean hasTransparency;
 
 }

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

@@ -16,7 +16,6 @@ public class PdfImage {
     private BufferedImage image;
     @NonNull
     private RedRectangle2D position;
-    @NonNull
     private ImageType imageType;
     private boolean isAppendedToParagraph;
     private boolean hasTransparency;

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

@@ -1,14 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import lombok.Data;
-
-@Data
-public class Classification {
-
-    private Map<String, Float> probabilities = new HashMap<>();
-    private String label;
-
-}

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

@@ -1,10 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class FilterGeometry {
-
-    private ImageSize imageSize;
-    private ImageFormat imageFormat;
-}

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

@@ -1,11 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Filters {
-
-    private FilterGeometry geometry;
-    private Probability probability;
-    private boolean allPassed;
-}

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

@@ -1,9 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Geometry {
-    private float width;
-    private float height;
-}

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

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageFormat {
-
-    private float quotient;
-    private boolean tooTall;
-    private boolean tooWide;
-
-}

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

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageMetadata {
-
-    private Classification classification;
-    private Position position;
-    private Geometry geometry;
-    private Filters filters;
-}

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

@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class ImageServiceResponse {
-
-    private String dossierId;
-    private String fileId;
-    private List<ImageMetadata> data = new ArrayList<>();
-
-}

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

@@ -1,12 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class ImageSize {
-
-    private float quotient;
-    private boolean tooLarge;
-    private boolean tooSmall;
-
-}

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

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

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

@@ -1,10 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model.image;
-
-import lombok.Data;
-
-@Data
-public class Probability {
-
-    private boolean unconfident;
-
-}

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

@@ -1,7 +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.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -10,39 +8,26 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
@@ -67,11 +52,10 @@ public class AnalyzeService {
     private final RedactionServiceSettings redactionServiceSettings;
     private final SectionTextBuilderService sectionTextBuilderService;
     private final SectionGridCreatorService sectionGridCreatorService;
-    private final ImageService imageService;
-    private final ImportedRedactionService importedRedactionService;
+    private final NerAnalyserService nerAnalyserService;
 
 
-    public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
+    public void analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
 
         long startTime = System.currentTimeMillis();
 
@@ -79,13 +63,9 @@ public class AnalyzeService {
         Document classifiedDoc;
 
         try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
-
-            Map<Integer, List<PdfImage>> pdfImages = null;
-            if (redactionServiceSettings.isEnableImageClassification()) {
-                pdfImages = imageService.convertImages(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-            }
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, pdfImages);
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
+                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
             pageCount = classifiedDoc.getPages().size();
         } catch (Exception e) {
             throw new RedactionException(e);
@@ -94,27 +74,54 @@ public class AnalyzeService {
         List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
         sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
 
-        Text text = new Text(pageCount, sectionTexts);
+        Text text = new Text(pageCount,sectionTexts);
 
         // enhance section grid with headline data
-        sectionTexts.forEach(sectionText -> classifiedDoc.getSectionGrid()
-                .getSections()
-                .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
-                        .stream()
-                        .map(SectionArea::getPage)
-                        .collect(Collectors.toSet()), sectionText.getSectionAreas())));
+        sectionTexts.forEach(sectionText -> classifiedDoc
+                .getSectionGrid().getSections().add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(),
+                        sectionText.getHeadline(),
+                        sectionText.getSectionAreas().stream().map(SectionArea::getPage).collect(Collectors.toSet()),
+                        sectionText.getSectionAreas())));
 
-        log.info("Store text and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
         redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc.getSectionGrid());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
+                .getSectionGrid());
 
-        return AnalyzeResult.builder()
-                .dossierId(analyzeRequest.getDossierId())
-                .fileId(analyzeRequest.getFileId())
-                .duration(System.currentTimeMillis() - startTime)
-                .numberOfPages(text.getNumberOfPages())
-                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
-                .build();
+        log.info("Document structure analysis successful, took: {}", System.currentTimeMillis() - startTime);
+    }
+
+
+    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        if(redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null){
+            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        }
+
+        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
+
+        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
+
+        dictionaryService.updateExternalDictionary(dictionary, analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+
+        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
+                .getDossierTemplateId());
+
+        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), redactionLogEntries, legalBasis, dictionary
+                .getVersion()
+                .getDossierTemplateVersion(), dictionary.getVersion()
+                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
     }
 
 
@@ -131,7 +138,8 @@ public class AnalyzeService {
             return analyze(analyzeRequest);
         }
 
-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
+                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
 
         Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse()
                 .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
@@ -140,11 +148,10 @@ public class AnalyzeService {
             return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
         }
 
-        NerEntities nerEntities;
-        if (redactionServiceSettings.isNerServiceEnabled()) {
+        var nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        if(redactionServiceSettings.isEnableEntityRecognition() && nerEntities == null){
+            nerAnalyserService.computeNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
             nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        } else {
-            nerEntities = NerEntities.builder().build();
         }
 
         List<SectionText> reanalysisSections = text.getSectionTexts()
@@ -154,54 +161,19 @@ public class AnalyzeService {
 
         KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
 
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
 
         PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
-        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
-
-        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false);
-
-        redactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()) && !entry.getType()
-                        .equals(IMPORTED_REDACTION_TYPE));
-        redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest
+                .getDossierTemplateId());
 
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
         return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
     }
 
 
-    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-
-        NerEntities nerEntities;
-        if (redactionServiceSettings.isNerServiceEnabled()) {
-            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        } else {
-            nerEntities = NerEntities.builder().build();
-        }
-        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-
-        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
-
-        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
-
-        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(), redactionLogEntries, legalBasis, dictionary.getVersion()
-                .getDossierTemplateVersion(), dictionary.getVersion()
-                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
-
-        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog.getRedactionLogEntry(), true);
-        redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
-
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
-    }
-
-
     private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
                                                  Text text, AnalyzeRequest analyzeRequest) {
 
@@ -211,7 +183,7 @@ public class AnalyzeService {
         Set<Integer> sectionsToReanalyse = new HashSet<>();
         Map<Integer, Set<Image>> imageEntries = new HashMap<>();
         for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isLocalManualRedaction() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
+            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                 sectionsToReanalyse.add(entry.getSectionNumber());
             }
             if (entry.isImage()) {
@@ -242,8 +214,9 @@ public class AnalyzeService {
 
         excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
 
-        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog, analyzeRequest.getAnalysisNumber());
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
+        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange
+                .getRedactionLog());
 
         long duration = System.currentTimeMillis() - startTime;
 
@@ -254,13 +227,11 @@ public class AnalyzeService {
                 .numberOfPages(text.getNumberOfPages())
                 .hasUpdates(redactionLogChange.isHasChanges())
                 .analysisVersion(redactionServiceSettings.getAnalysisVersion())
-                .analysisNumber(analyzeRequest.getAnalysisNumber())
                 .rulesVersion(redactionLog.getRulesVersion())
                 .dictionaryVersion(redactionLog.getDictionaryVersion())
                 .legalBasisVersion(redactionLog.getLegalBasisVersion())
                 .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                 .wasReanalyzed(isReanalysis)
-                .manualRedactions(analyzeRequest.getManualRedactions())
                 .build();
     }
 
@@ -277,9 +248,8 @@ public class AnalyzeService {
                 .stream()
                 .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
                 .stream()
-                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions()
-                .stream()
-                .map(ManualForceRedaction::getAnnotationId)))).collect(Collectors.toSet());
+                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions().stream().map(ManualForceRedaction::getAnnotationId))))
+                .collect(Collectors.toSet());
     }
 
 

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

@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -16,10 +15,13 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
+import java.awt.Color;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -105,10 +107,10 @@ public class AnnotationService {
 
     private String createAnnotationContent(RedactionLogEntry redactionLogEntry) {
 
-        if (redactionLogEntry.isLocalManualRedaction()) {
+        if (redactionLogEntry.isManual()) {
             return "\nManual Redaction\n\nIn Section : \"" + redactionLogEntry.getSection() + "\"";
         }
-        return redactionLogEntry.getType() + " \nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
+        return "\nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
                 .getLegalBasis() + "\n\nIn section: \"" + redactionLogEntry.getSection() + "\"";
     }
 

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

@@ -5,6 +5,8 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ty
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -12,8 +14,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;
 
-import java.awt.*;
-import java.util.List;
+import java.awt.Color;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -35,13 +36,13 @@ public class DictionaryService {
         long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId);
         var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
         if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, getVersion(dossierTemplateDictionary), null);
+            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, null);
         }
 
         long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
         var dossierDictionary = dictionariesByDossier.get(dossierId);
         if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, getVersion(dossierDictionary), dossierId);
+            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
         }
 
         return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
@@ -60,19 +61,9 @@ public class DictionaryService {
                     newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                 }
             });
-            dictionaryModel.getFalsePositives().forEach(dictionaryEntry -> {
-                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
-                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                }
-            });
-            dictionaryModel.getFalseRecommendations().forEach(dictionaryEntry -> {
-                if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
-                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                }
-            });
         });
 
-        if (dictionariesByDossier.containsKey(dossierId)) {
+        if(dictionariesByDossier.containsKey(dossierId)) {
             dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
             dictionaryModels.forEach(dictionaryModel -> {
                 dictionaryModel.getEntries().forEach(dictionaryEntry -> {
@@ -80,16 +71,6 @@ public class DictionaryService {
                         newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
                     }
                 });
-                dictionaryModel.getFalsePositives().forEach(dictionaryEntry -> {
-                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
-                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                    }
-                });
-                dictionaryModel.getFalseRecommendations().forEach(dictionaryEntry -> {
-                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
-                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                    }
-                });
             });
         }
 
@@ -97,7 +78,7 @@ public class DictionaryService {
     }
 
 
-    private void updateDictionaryEntry(String dossierTemplateId, long version, Long currentVersion, String dossierId) {
+    private void updateDictionaryEntry(String dossierTemplateId, long version, String dossierId) {
 
         try {
             DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();
@@ -107,46 +88,8 @@ public class DictionaryService {
 
                 List<DictionaryModel> dictionary = typeResponse
                         .stream()
-                        .map(t -> {
-
-                            Optional<DictionaryModel> oldModel;
-                            if (dossierId == null) {
-                                var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
-                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
-                            } else {
-                                var representation = dictionariesByDossier.get(dossierId);
-                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
-                            }
-
-                            Set<DictionaryEntry> entries = new HashSet<>();
-                            Set<DictionaryEntry> falsePositives = new HashSet<>();
-                            Set<DictionaryEntry> falseRecommendations = new HashSet<>();
-
-                            DictionaryEntries newEntries = getEntries(t.getId(), currentVersion);
-
-                            var newValues = newEntries.getEntries().stream().map(v -> v.getValue()).collect(Collectors.toSet());
-                            var newFalsePositivesValues = newEntries.getFalsePositives().stream().map(v -> v.getValue()).collect(Collectors.toSet());
-                            var newFalseRecommendationsValues = newEntries.getFalseRecommendations().stream().map(v -> v.getValue()).collect(Collectors.toSet());
-
-                            // add old entries from existing DictionaryModel
-                            oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries().stream().filter(
-                                    f -> !newValues.contains(f.getValue())).collect(Collectors.toList())
-                            ));
-                            oldModel.ifPresent(dictionaryModel -> falsePositives.addAll(dictionaryModel.getFalsePositives().stream().filter(
-                                    f -> !newFalsePositivesValues.contains(f.getValue())).collect(Collectors.toList())
-                            ));
-                            oldModel.ifPresent(dictionaryModel -> falseRecommendations.addAll(dictionaryModel.getFalseRecommendations().stream().filter(
-                                    f -> !newFalseRecommendationsValues.contains(f.getValue())).collect(Collectors.toList())
-                            ));
-
-                            // Add Increments
-                            entries.addAll(newEntries.getEntries());
-                            falsePositives.addAll(newEntries.getFalsePositives());
-                            falseRecommendations.addAll(newEntries.getFalseRecommendations());
-
-                            return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                    .isHint(), entries, falsePositives, falseRecommendations, new HashSet<>(), dossierId != null);
-                        })
+                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                .isHint(), t.isRecommendation(), convertEntries(t.getId()), new HashSet<>(), dossierId != null))
                         .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
 
@@ -162,7 +105,7 @@ public class DictionaryService {
                 dictionaryRepresentation.setDictionaryVersion(version);
                 dictionaryRepresentation.setDictionary(dictionary);
 
-                if (dossierId == null) {
+                if(dossierId == null) {
                     dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
                 } else {
                     dictionariesByDossier.put(dossierId, dictionaryRepresentation);
@@ -175,20 +118,31 @@ public class DictionaryService {
     }
 
 
-    private DictionaryEntries getEntries(String typeId, Long fromVersion) {
+    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId, String dossierId) {
 
-        var type = dictionaryClient.getDictionaryForType(typeId, fromVersion);
+        dictionary.getDictionaryModels().forEach(dm -> {
+            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
+                dictionaryClient.addEntries(IdBuilder.getTypeId(dm.getType(), dossierTemplateId, dm.isDossierDictionary() ? dossierId : null), new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
+                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
+                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
+                }
+            }
+        });
+    }
 
-        Set<DictionaryEntry> entries = type.getEntries() != null ? new HashSet<>(type.getEntries()) : new HashSet<>();
-        Set<DictionaryEntry> falsePositives = type.getFalsePositiveEntries() != null ? new HashSet<>(type.getFalsePositiveEntries()) : new HashSet<>();
-        Set<DictionaryEntry> falseRecommendations = type.getFalseRecommendationEntries() != null ? new HashSet<>(type.getFalseRecommendationEntries()) : new HashSet<>();
+
+    private Set<DictionaryEntry> convertEntries(String typeId) {
+
+        var type = dictionaryClient.getDictionaryForType(typeId);
+
+        Set<DictionaryEntry> entries = new HashSet<>(type
+                .getEntries());
 
         if (type.isCaseInsensitive()) {
             entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
-            falsePositives.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
-            falseRecommendations.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
         }
-        return new DictionaryEntries(entries, falsePositives, falseRecommendations);
+        return entries;
     }
 
 
@@ -229,6 +183,16 @@ public class DictionaryService {
     }
 
 
+    public boolean isRecommendation(String type, String dossierTemplateId) {
+
+        DictionaryModel model = dictionariesByDossierTemplate.get(dossierTemplateId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
     public Dictionary getDeepCopyDictionary(String dossierTemplateId, String dossierId) {
 
         List<DictionaryModel> copy = new ArrayList<>();
@@ -240,7 +204,7 @@ public class DictionaryService {
 
         //TODO merge dictionaries if they have same names
         long dossierDictionaryVersion = -1;
-        if (dictionariesByDossier.containsKey(dossierId)) {
+        if(dictionariesByDossier.containsKey(dossierId)) {
             var dossierRepresentation = dictionariesByDossier.get(dossierId);
             dossierRepresentation.getDictionary().forEach(dm -> {
                 copy.add(SerializationUtils.clone(dm));
@@ -269,11 +233,4 @@ public class DictionaryService {
         return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
     }
 
-    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {
-        if (dictionaryRepresentation == null) {
-            return null;
-        } else {
-            return dictionaryRepresentation.getDictionaryVersion();
-        }
-    }
 }

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

@@ -9,23 +9,21 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualImageRecategorization;
+import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.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;
@@ -61,9 +59,7 @@ public class EntityRedactionService {
             EntitySearchUtils.removeEntitiesContainedInLarger(entities);
         }
 
-        Map<Integer, List<Entity>> entitiesPerPage = convertToEntitiesPerPage(entities);
-        EntitySearchUtils.removeEntitiesContainedInRedactedLogos(imagesPerPage, entitiesPerPage);
-
+        Map<Integer, List<Entity>> entitiesPerPage = convertToEnititesPerPage(entities);
         return new PageEntities(entitiesPerPage, imagesPerPage);
     }
 
@@ -76,62 +72,38 @@ public class EntityRedactionService {
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         for (SectionText reanalysisSection : reanalysisSections) {
 
-            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
+            Set<Entity> entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
                     .getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts());
 
             if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
-                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary, reanalysisSection
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                         .getCellStarts());
             } else {
-                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary);
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
             }
 
-            if (!local && analyzeRequest.getManualRedactions() != null) {
-
-                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
-                        .filter(fr -> fr.getStatus() == AnnotationStatus.APPROVED)
-                        .filter(fr -> fr.getRequestDate() != null)
-                        .collect(Collectors.toList());
-                // only approved id removals, that haven't been forced back afterwards
-                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
-                        .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
-                        .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
-                        .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());
-
-                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
-                        .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
-                    for (Image image : reanalysisSection.getImages()) {
-                        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
-                        for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
-                                .getImageRecategorization()) {
-                            if (imageRecategorization.getStatus()
-                                    .equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
-                                    .equals(imageId)) {
-                                image.setType(imageRecategorization.getType());
-                            }
-                        }
-                        if (idsToRemove.contains(imageId)) {
-                            image.setIgnored(true);
+            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
+                    .getImageRecategorization() != null) {
+                for (Image image : reanalysisSection.getImages()) {
+                    String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+                    for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
+                            .getImageRecategorization()) {
+                        if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
+                                .equals(imageId)) {
+                            image.setType(imageRecategorization.getType());
                         }
                     }
                 }
-
-                entities.getEntities().forEach(entity -> entity.getPositionSequences().forEach(ps -> {
-                    if (idsToRemove.contains(ps.getId())) {
-                        entity.setIgnored(true);
-                    }
-                }));
             }
 
             sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                     .isLocal(false)
                     .dictionaryTypes(dictionary.getTypes())
                     .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
-                            .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
                                     .stream())
-                            .collect(Collectors.toSet()) : entities.getEntities())
-                    .nerEntities(entities.getNerEntities())
+                            .collect(Collectors.toSet()) : entities)
                     .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                     .searchText(reanalysisSection.getSearchableText().toString())
                     .headline(reanalysisSection.getHeadline())
@@ -162,7 +134,7 @@ public class EntityRedactionService {
     }
 
 
-    private Map<Integer, List<Entity>> convertToEntitiesPerPage(Set<Entity> entities) {
+    private Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities) {
 
         Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
         for (Entity entity : entities) {
@@ -177,8 +149,7 @@ public class EntityRedactionService {
                         .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                 .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                 .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity
-                                .getReferences(), entity.getEntityType()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity.getReferences()));
             }
         }
         return entitiesPerPage;
@@ -200,6 +171,13 @@ public class EntityRedactionService {
     private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {
 
         analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+            if (dictionary.isRecommendation(key)) {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    if (!dictionary.containsValue(key, value)) {
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    }
+                });
+            } else {
                 analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
 
                     if (dictionary.getLocalAccessMap().get(key) == null) {
@@ -212,62 +190,70 @@ public class EntityRedactionService {
 
                     dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
                 });
+            }
         });
     }
 
 
-    private Entities findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                  Dictionary dictionary, boolean local, NerEntities nerEntities,
-                                  List<Integer> cellStarts) {
+    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                     Dictionary dictionary, boolean local, NerEntities nerEntities,
+                                     List<Integer> cellstarts) {
 
         Set<Entity> found = new HashSet<>();
         String searchableString = searchableText.toString();
         if (StringUtils.isEmpty(searchableString)) {
-            return new Entities(new HashSet<>(), new HashSet<>());
+            return found;
         }
 
         String lowercaseInputString = searchableString.toLowerCase();
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.findEntities(lowercaseInputString, model.getValues(local), model, headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false, local ? true : false));
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
             } else {
-                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.findEntities(searchableString, model.getValues(local), model, headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false, local ? true : false));
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
             }
         }
 
-        Set<Entity> nerFound = new HashSet<>();
         if (!local) {
-            nerFound.addAll(getNerValues(sectionNumber, nerEntities, cellStarts, headline));
+            Map<String, Set<String>> nerValuesPerType = getNerValues(sectionNumber, nerEntities, cellstarts);
+            nerValuesPerType.entrySet().forEach(entry -> {
+                EntitySearchUtils.addEntitiesWithHigherRank(found, EntitySearchUtils.find(searchableString, entry.getValue(), entry
+                        .getKey(), headline, sectionNumber, false, false, Engine.NER), dictionary);
+            });
         }
 
-        return new Entities(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary), nerFound);
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
     }
 
 
-    private Set<Entity> getNerValues(int sectionNumber, NerEntities nerEntities, List<Integer> cellStarts,
-                                     String headline) {
+    private Map<String, Set<String>> getNerValues(int sectionNumber, NerEntities nerEntities,
+                                                  List<Integer> cellstarts) {
 
-        Set<Entity> entities = new HashSet<>();
+        Map<String, Set<String>> nerValuesPerType = new HashMap<>();
 
-        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getData().containsKey(sectionNumber)) {
-            nerEntities.getData().get(sectionNumber).forEach(res -> {
-                if (cellStarts == null || cellStarts.isEmpty()) {
-                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
+        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities.getResult()
+                .containsKey(sectionNumber)) {
+            nerEntities.getResult().get(sectionNumber).forEach(res -> {
+                if (cellstarts == null || cellstarts.isEmpty()) {
+                    nerValuesPerType.computeIfAbsent(res.getType(), (a) -> new HashSet<>())
+                            .add(new String(Base64.decodeBase64(res.getValue().getBytes())));
                 } else {
                     boolean intersectsCellStart = false;
-                    for (Integer cellStart : cellStarts) {
+                    for (Integer cellStart : cellstarts) {
                         if (res.getStartOffset() < cellStart && cellStart < res.getEndOffset()) {
                             intersectsCellStart = true;
-                            break;
                         }
                     }
                     if (!intersectsCellStart) {
-                        entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
+                        nerValuesPerType.computeIfAbsent(res.getType(), (a) -> new HashSet<>())
+                                .add(new String(Base64.decodeBase64(res.getValue().getBytes())));
                     }
                 }
             });
         }
-        return entities;
+        return nerValuesPerType;
     }
 
 }

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

@@ -0,0 +1,71 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
+import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
+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.settings.RedactionServiceSettings;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.io.ByteArrayOutputStream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageClassificationService {
+
+    private final ImageClassificationClient imageClassificationClient;
+    private final RedactionServiceSettings settings;
+
+
+    public void classifyImages(Page page) {
+
+        page.getImages().forEach(image -> {
+
+            if (settings.isEnableImageClassification() && !isEntirePageImage(image, page)) {
+
+                long start = System.currentTimeMillis();
+                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                    ImageIO.write(image.getImage(), "png", baos);
+                    var mockFile = new MockMultipartFile("file", "Image.png", "image/png", baos.toByteArray());
+                    ImageClassificationResponse response = imageClassificationClient.classify(mockFile);
+                    image.setImageType(ImageType.valueOf(response.getCategory()));
+                } catch (Exception e) {
+                    log.error("Could not classify image", e);
+                    image.setImageType(ImageType.OTHER);
+                }
+                log.info("Image classification took: " + (System.currentTimeMillis() - start));
+            } else {
+                image.setImageType(ImageType.OTHER);
+            }
+
+            image.getImage().flush();
+            image.setImage(null);
+
+            if (image.getImageType().equals(ImageType.OTHER)) {
+                page.getTextBlocks().forEach(textblock -> {
+                    if (image.getPosition()
+                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
+                        image.setImageType(ImageType.OCR);
+                    }
+                });
+            }
+        });
+
+    }
+
+    private boolean isEntirePageImage(PdfImage image, Page page){
+        double imageArea = image.getPosition().getHeight() * image.getPosition().getWidth();
+        if(imageArea / page.getCropBoxArea() >= settings.getMaxImageCropboxRatio()){
+            log.info("Skipping image classification because images is almost as large as the entire page");
+            return true;
+        }
+        return false;
+    }
+
+}

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

@@ -1,102 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.ImportedRedaction;
-import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class ImportedRedactionService {
-
-    public static final String IMPORTED_REDACTION_TYPE = "imported_redaction";
-
-    private final DictionaryService dictionaryService;
-    private final RedactionStorageService redactionStorageService;
-
-
-    public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId, String dossierId, String fileId,
-                                          List<RedactionLogEntry> redactionLogEntries, boolean addImportedRedactions) {
-
-        var importedRedactions = redactionStorageService.getImportedRedactions(dossierId, fileId);
-        if (importedRedactions == null) {
-            return redactionLogEntries;
-        }
-
-        redactionLogEntries.removeIf(redactionLogEntry -> hasIntersections(redactionLogEntry, importedRedactions));
-
-        if (addImportedRedactions) {
-            return addImportedRedactionsRedactionLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
-        }
-
-        return redactionLogEntries;
-    }
-
-
-    private List<RedactionLogEntry> addImportedRedactionsRedactionLogEntries(String dossierTemplateId,
-                                                          List<RedactionLogEntry> redactionLogEntries,
-                                                          ImportedRedactions importedRedactions) {
-
-        for (List<ImportedRedaction> importedRedactionsValues : importedRedactions.getImportedRedactions().values()) {
-            for (ImportedRedaction importedRedaction : importedRedactionsValues) {
-                RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
-                        .id(importedRedaction.getId())
-                        .type(IMPORTED_REDACTION_TYPE)
-                        .imported(true)
-                        .redacted(true)
-                        .positions(importedRedaction.getPositions())
-                        .color(getColor("imported_redaction", dossierTemplateId))
-                        .build();
-
-                redactionLogEntries.add(redactionLogEntry);
-            }
-        }
-
-        return redactionLogEntries;
-    }
-
-
-    private boolean hasIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
-
-        for (Rectangle rectangle : redactionLogEntry.getPositions()) {
-            if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
-                var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPage());
-                for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
-                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
-                        if (intersects(importedRedactionPosition, rectangle)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-
-    private boolean intersects(Rectangle importedPosition, Rectangle redactionLogPosition) {
-
-        return redactionLogPosition.getTopLeft()
-                .getX() + redactionLogPosition.getWidth() > importedPosition.getTopLeft()
-                .getX() && redactionLogPosition.getTopLeft()
-                .getY() + redactionLogPosition.getHeight() > importedPosition.getTopLeft()
-                .getY() && redactionLogPosition.getTopLeft().getX() < importedPosition.getTopLeft()
-                .getX() + importedPosition.getWidth() && redactionLogPosition.getTopLeft()
-                .getY() < importedPosition.getTopLeft().getY() + importedPosition.getHeight();
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId) {
-
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-}

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

@@ -1,153 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.Text;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ManualRedactionSurroundingTextService {
-
-    private final RedactionStorageService redactionStorageService;
-    private final SurroundingWordsService surroundingWordsService;
-
-
-    public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
-
-        long startTime = System.currentTimeMillis();
-        Text text = redactionStorageService.getText(dossierId, fileId);
-        List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
-        List<ManualResizeRedaction> processedResizeRedactions = new ArrayList<>();
-
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (manualRedactions.getEntriesToAdd().isEmpty() && manualRedactions.getResizeRedactions().isEmpty()) {
-                break;
-            }
-
-            for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-
-                var addItty = manualRedactions.getEntriesToAdd().iterator();
-                while (addItty.hasNext()) {
-                    var manualAddRedaction = addItty.next();
-                    if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
-                        manualAddRedaction.setTextBefore(surroundingText.getLeft());
-                        manualAddRedaction.setTextAfter(surroundingText.getRight());
-                        processedAddRedactions.add(manualAddRedaction);
-                        addItty.remove();
-                    }
-                }
-
-                var resizeItty = manualRedactions.getResizeRedactions().iterator();
-                while (resizeItty.hasNext()) {
-                    var manualResizeRedaction = resizeItty.next();
-                    if (sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction.getPositions());
-                        manualResizeRedaction.setTextBefore(surroundingText.getLeft());
-                        manualResizeRedaction.setTextAfter(surroundingText.getRight());
-                        processedResizeRedactions.add(manualResizeRedaction);
-                        resizeItty.remove();
-                    }
-                }
-            }
-        }
-
-        manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
-        manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
-
-        return AnalyzeResult.builder()
-                .dossierId(dossierId)
-                .fileId(fileId)
-                .manualRedactions(manualRedactions)
-                .duration(System.currentTimeMillis() - startTime)
-                .build();
-    }
-
-
-    private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
-                                                     List<Rectangle> toFindPositions) {
-
-        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, false, EntityType.ENTITY);
-        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
-
-        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
-
-        if (correctEntity == null) {
-            log.warn("Could not calculate surrounding text");
-            return Pair.of("", "");
-        }
-
-        if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText.getCellStarts());
-        } else {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null);
-        }
-
-        return Pair.of(correctEntity.getTextBefore(), correctEntity.getTextAfter());
-    }
-
-
-    private boolean sectionContainsEntry(SectionArea sectionArea, List<Rectangle> positions) {
-
-        for (Rectangle position : positions) {
-            if (sectionArea.contains(position)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    private Entity getEntityOnCorrectPosition(Set<Entity> entitiesWithPositions, List<Rectangle> toFindPositions) {
-
-        for (Entity entityWithPos : entitiesWithPositions) {
-            for (EntityPositionSequence entityPositionSequence : entityWithPos.getPositionSequences()) {
-                for (TextPositionSequence textPositionSequence : entityPositionSequence.getSequences()) {
-                    for (Rectangle manualRedactionRectangle : toFindPositions) {
-                        if (intersects(manualRedactionRectangle, textPositionSequence.getRectangle())) {
-                            return entityWithPos;
-                        }
-                    }
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    public boolean intersects(Rectangle manualPosition,
-                              com.iqser.red.service.redaction.v1.model.Rectangle textPositionRectangle) {
-
-        return textPositionRectangle.getTopLeft()
-                .getX() + textPositionRectangle.getWidth() > manualPosition.getTopLeftX() && textPositionRectangle.getTopLeft()
-                .getY() + textPositionRectangle.getHeight() > manualPosition.getTopLeftY() && textPositionRectangle.getTopLeft()
-                .getX() < manualPosition.getTopLeftX() + manualPosition.getWidth() && textPositionRectangle.getTopLeft()
-                .getY() < manualPosition.getTopLeftY() + manualPosition.getHeight();
-    }
-
-}

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

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

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

@@ -1,14 +1,25 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+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.springframework.stereotype.Service;
 
-import java.time.OffsetDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
+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.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogChanges;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Service
@@ -18,7 +29,7 @@ public class RedactionChangeLogService {
     private final RedactionStorageService redactionStorageService;
 
 
-    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog, int analysisNumber) {
+    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog) {
 
         long start = System.currentTimeMillis();
 
@@ -26,23 +37,24 @@ public class RedactionChangeLogService {
 
         if (previousRedactionLog == null) {
             currentRedactionLog.getRedactionLogEntry().forEach(entry -> {
-                entry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+                entry.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
             });
             return new RedactionLogChanges(currentRedactionLog, false);
         }
 
         List<RedactionLogEntry> notRemovedPreviousEntries = previousRedactionLog.getRedactionLogEntry()
                 .stream()
-                .filter(entry -> !entry.lastChangeIsRemoved())
+                .filter(entry -> !entry.getChanges()
+                        .get(entry.getChanges().size() - 1)
+                        .getType()
+                        .equals(ChangeType.REMOVED))
                 .collect(Collectors.toList());
 
-        Set<RedactionLogEntry> added = currentRedactionLog.getRedactionLogEntry().stream()
-                .filter(entry -> entry.getChanges().isEmpty() || !entry.lastChangeIsRemoved()).collect(Collectors.toSet());
-
-        notRemovedPreviousEntries.forEach(added::remove);
+        Set<RedactionLogEntry> added = new HashSet<>(currentRedactionLog.getRedactionLogEntry());
+        added.removeAll(notRemovedPreviousEntries);
 
         Set<RedactionLogEntry> removed = new HashSet<>(notRemovedPreviousEntries);
-        currentRedactionLog.getRedactionLogEntry().forEach(removed::remove);
+        removed.removeAll(currentRedactionLog.getRedactionLogEntry());
 
         Map<String, RedactionLogEntry> addedIds = new HashMap<>();
         added.forEach(entry -> {
@@ -60,16 +72,16 @@ public class RedactionChangeLogService {
         newRedactionLogEntries.forEach(entry -> {
             if (removedIds.contains(entry.getId()) && addedIds.containsKey(entry.getId())) {
                 List<Change> changes = entry.getChanges();
-                changes.add(new Change(analysisNumber, ChangeType.CHANGED, OffsetDateTime.now()));
+                changes.add(new Change(ChangeType.CHANGED, OffsetDateTime.now()));
                 var newEntry = addedIds.get(entry.getId());
                 newEntry.setChanges(changes);
                 addedIds.put(entry.getId(), newEntry);
                 toRemove.add(entry);
             } else if (removedIds.contains(entry.getId())) {
-                entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, OffsetDateTime.now()));
+                entry.getChanges().add(new Change(ChangeType.REMOVED, OffsetDateTime.now()));
             } else if (addedIds.containsKey(entry.getId())) {
                 List<Change> changes = entry.getChanges();
-                changes.add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+                changes.add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
                 var newEntry = addedIds.get(entry.getId());
                 newEntry.setChanges(changes);
                 addedIds.put(entry.getId(), newEntry);
@@ -80,8 +92,8 @@ public class RedactionChangeLogService {
         newRedactionLogEntries.removeAll(toRemove);
 
         addedIds.forEach((k, v) -> {
-            if (v.getChanges().isEmpty()) {
-                v.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+            if(v.getChanges().isEmpty()) {
+                v.getChanges().add(new Change(ChangeType.ADDED, OffsetDateTime.now()));
             }
             newRedactionLogEntries.add(v);
         });

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

@@ -17,7 +17,6 @@ import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
@@ -71,6 +70,7 @@ public class RedactionLogCreatorService {
                     .legalBasis(image.getLegalBasis())
                     .matchedRule(image.getMatchedRule())
                     .isHint(dictionaryService.isHint(image.getType(), dossierTemplateId))
+                    .manual(false)
                     .isDictionaryEntry(false)
                     .isRecommendation(false)
                     .positions(List.of(new Rectangle(new Point((float) image.getPosition()
@@ -92,7 +92,7 @@ public class RedactionLogCreatorService {
 
         List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
 
-        // Duplicates can exist due table extraction columns over multiple rows.
+        // Duplicates can exist due table extraction colums over multiple rows.
         Set<String> processedIds = new HashSet<>();
 
         entityLoop:
@@ -140,14 +140,14 @@ public class RedactionLogCreatorService {
         } else {
             float x = textPositions.get(0).getXDirAdj();
             float y = textPositions.get(0).getYDirAdj();
-            float width = textPositions.get(0).getWidthDirAdj();
+            float width = textPositions.get(0).getWidth();
             float height = textPositions.get(0).getHeightDir();
             int startIndex = 0;
 
             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 widthDir = textPositions.get(i).getWidth();
                 float heightDir = textPositions.get(i).getHeightDir();
 
                 if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
@@ -173,7 +173,10 @@ public class RedactionLogCreatorService {
     private boolean isCharClose(float x, float xDirAdj, float width) {
 
         float max = x + (5 * width);
-        return xDirAdj < max;
+        if (xDirAdj < max) {
+            return true;
+        }
+        return false;
     }
 
 
@@ -187,7 +190,11 @@ public class RedactionLogCreatorService {
         float minY = y - offsetY;
         float maxY = y + offsetY;
 
-        return yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight;
+        if (yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight) {
+            return true;
+        }
+
+        return false;
     }
 
 
@@ -204,8 +211,7 @@ public class RedactionLogCreatorService {
                 .type(entity.getType())
                 .redacted(entity.isRedaction())
                 .isHint(isHint(entity.getType(), dossierTemplateId))
-                .isRecommendation(entity.getEntityType().equals(EntityType.RECOMMENDATION))
-                .isFalsePositive(entity.getEntityType().equals(EntityType.FALSE_POSITIVE) || entity.getEntityType().equals(EntityType.FALSE_RECOMMENDATION))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                 .section(entity.getHeadline())
                 .sectionNumber(entity.getSectionNumber())
                 .matchedRule(entity.getMatchedRule())
@@ -235,4 +241,10 @@ public class RedactionLogCreatorService {
         return dictionaryService.isHint(type, dossierTemplateId);
     }
 
+
+    private boolean isRecommendation(String type, String dossierTemplateId) {
+
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
+    }
+
 }

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

@@ -1,11 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +9,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.awt.Color;
 import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -23,18 +18,18 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class RedactionLogMergeService {
 
+    private final DictionaryService dictionaryService;
 
     private final SectionTextService sectionTextService;
 
 
-    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
-                                              String dossierTemplateId, ManualRedactions manualRedactions,
-                                              Set<Integer> excludedPages, List<Type> types, Colors colors) {
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
 
         log.info("Merging Redaction log with manual redactions");
         if (manualRedactions != null) {
 
-            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), colors, types);
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
 
             redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
 
@@ -44,13 +39,13 @@ public class RedactionLogMergeService {
 
                 processRedactionLogEntry(manualRedactionWrappers.stream()
                         .filter(mr -> entry.getId().equals(mr.getId()))
-                        .collect(Collectors.toList()), entry, types, colors);
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
 
                 entry.setComments(manualRedactions.getComments().get(entry.getId()));
 
                 if (excludedPages != null && !excludedPages.isEmpty()) {
                     entry.getPositions().forEach(pos -> {
-                        if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) {
+                        if (!entry.isManual() && excludedPages.contains(pos.getPage())) {
                             entry.setExcluded(true);
                         }
                     });
@@ -61,7 +56,7 @@ public class RedactionLogMergeService {
 
         Set<String> processedIds = new HashSet<>();
         redactionLog.getRedactionLogEntry().removeIf(entry -> {
-            if (processedIds.contains(entry.getId())) {
+            if(processedIds.contains(entry.getId())){
                 log.info("Duplicate annotation found with id {}", entry.getId());
                 return true;
             }
@@ -113,7 +108,7 @@ public class RedactionLogMergeService {
 
 
     private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
-                                          RedactionLogEntry redactionLogEntry, List<Type> types, Colors colors) {
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
 
         manualRedactionWrappers.forEach(mrw -> {
 
@@ -121,80 +116,79 @@ public class RedactionLogMergeService {
                 var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
                 String manualOverrideReason = null;
                 if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
-
-
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                     redactionLogEntry.setType(imageRecategorization.getType());
+                    redactionLogEntry.setHasBeenRecategorized(true);
                     redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
-
-                    if (isHint(types, imageRecategorization.getType())) {
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setHint(true);
-                    } else {
-                        redactionLogEntry.setHint(false);
-                    }
-
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
                 } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
+                } else {
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
 
+                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
                 redactionLogEntry.setReason(manualOverrideReason);
-
-                redactionLogEntry.getManualChanges().add(ManualChange.from(imageRecategorization)
-                        .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
-                        .withChange("type", imageRecategorization.getType()));
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
             }
 
             if (mrw.getItem() instanceof IdRemoval) {
                 var manualRemoval = (IdRemoval) mrw.getItem();
-                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
-                    log.debug("Skipping merge for dictionary-modifying entry");
+                String manualOverrideReason = null;
+                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setRedacted(false);
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), true));
+                    redactionLogEntry.setHasBeenRemovedByManualOverride(true);
+                } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                 } else {
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
-                        redactionLogEntry.setRedacted(false);
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), true, types));
-                        redactionLogEntry.setHint(false);
-                    } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
-                    }
-
-                    redactionLogEntry.setReason(manualOverrideReason);
-
-                    redactionLogEntry.getManualChanges().add(ManualChange.from(manualRemoval)
-                            .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ?
-                                    ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
             }
 
             if (mrw.getItem() instanceof ManualForceRedaction) {
                 var manualForceRedact = (ManualForceRedaction) mrw.getItem();
                 String manualOverrideReason = null;
-                var dictionaryIsHint = isHint(types, redactionLogEntry.getType());
                 if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    // Forcing a skipped hint should result in a hint
-                    if (dictionaryIsHint) {
-                        redactionLogEntry.setHint(true);
-                    } else {
-                        redactionLogEntry.setRedacted(true);
-                    }
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setRedacted(true);
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setHasBeenForced(true);
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
                 } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
-                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force " + (dictionaryIsHint ? "hint" : "redact"));
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
 
+                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
                 redactionLogEntry.setReason(manualOverrideReason);
-                var manualChange = ManualChange.from(manualForceRedact)
-                        .withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
-
-                redactionLogEntry.getManualChanges().add(manualChange);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
 
             }
 
@@ -202,9 +196,11 @@ public class RedactionLogMergeService {
                 var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
                 String manualOverrideReason = null;
                 if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
                     redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
                     redactionLogEntry.setRedacted(true);
+                    redactionLogEntry.setHasLegalBasisChanged(true);
                     if (manualLegalBasisChange.getSection() != null) {
                         redactionLogEntry.setSection(manualLegalBasisChange.getSection());
                     }
@@ -213,45 +209,46 @@ public class RedactionLogMergeService {
                     }
                 } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
 
+                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
                 redactionLogEntry.setReason(manualOverrideReason);
-
-                var manualChange = ManualChange.from(manualLegalBasisChange)
-                        .withManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-                manualChange.withChange("legalBasis", manualLegalBasisChange.getLegalBasis());
-                if (manualLegalBasisChange.getSection() != null) {
-                    manualChange.withChange("section", manualLegalBasisChange.getSection());
-                }
-                if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
-                    manualChange.withChange("value", manualLegalBasisChange.getValue());
-                }
-                redactionLogEntry.getManualChanges().add(manualChange);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
             }
 
             if (mrw.getItem() instanceof ManualResizeRedaction) {
                 var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
                 String manualOverrideReason = null;
                 if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, false, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setStatus(AnnotationStatus.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setValue(manualResizeRedact.getValue());
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                    redactionLogEntry.setHasBeenResized(true);
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
                 } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
-                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), colors, true, redactionLogEntry.isRedacted(), false, types));
+                    redactionLogEntry.setStatus(AnnotationStatus.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
-                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
-                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                } else {
+                    redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                 }
 
+                redactionLogEntry.setManualRedactionUserId(manualResizeRedact.getUser());
                 redactionLogEntry.setReason(manualOverrideReason);
-                redactionLogEntry.getManualChanges().add(ManualChange.from(manualResizeRedact)
-                        .withManualRedactionType(ManualRedactionType.RESIZE)
-                        .withChange("value", manualResizeRedact.getValue()));
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RESIZE);
+
             }
 
         });
@@ -273,18 +270,16 @@ public class RedactionLogMergeService {
 
 
     public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, Colors colors, List<Type> types) {
+                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
 
         List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
 
         for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
 
-            if (shouldCreateManualEntry(manualRedactionEntry)) {
-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), colors, types);
+            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
                 redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
                 redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
-                redactionLogEntry.setTextBefore(manualRedactionEntry.getTextBefore());
-                redactionLogEntry.setTextAfter(manualRedactionEntry.getTextAfter());
 
                 sectionTextService.handleSectionText(sectionGrid, redactionLogEntry);
 
@@ -295,36 +290,25 @@ public class RedactionLogMergeService {
         return redactionLogEntries;
     }
 
-
-    private List<Rectangle> convertPositions(
-            List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
-
-        return positions.stream()
-                .map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos.getHeight(), pos.getPage()))
-                .collect(Collectors.toList());
+    private List<Rectangle> convertPositions(List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
+        return positions.stream().map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos
+                .getHeight(), pos.getPage())).collect(Collectors.toList());
     }
 
 
-    @SuppressWarnings("PMD.UselessParentheses")
-    private boolean shouldCreateManualEntry(ManualRedactionEntry manualRedactionEntry) {
-        return (!manualRedactionEntry.isAddToDictionary() && !manualRedactionEntry.isAddToDossierDictionary())
-                || ((manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDictionary()) && manualRedactionEntry.getProcessedDate() == null);
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus()
+                .equals(AnnotationStatus.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
     }
 
 
     private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      Colors colors, List<Type> types) {
-
-        var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
-
-        var change = ManualChange.from(manualRedactionEntry)
-                .withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY);
-        List<ManualChange> changeList = new ArrayList<>();
-        changeList.add(change);
+                                                      String dossierTemplateId) {
 
         return RedactionLogEntry.builder()
                 .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), colors, manualRedactionEntry.getStatus(), types))
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
                 .reason(manualRedactionEntry.getReason())
                 .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
                 .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
@@ -335,59 +319,42 @@ public class RedactionLogMergeService {
                 .redacted(true)
                 .isHint(false)
                 .sectionNumber(-1)
+                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .manualRedactionUserId(manualRedactionEntry.getUser())
                 .rectangle(manualRedactionEntry.isRectangle())
-                .manualChanges(changeList)
                 .build();
     }
 
 
-    private float[] getColor(String type, Colors colors, boolean requested, boolean isRedaction,
-                             boolean skipped, List<Type> types) {
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
 
         if (requested) {
-            return convertColor(colors.getRequestRemove());
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
         }
-        if (skipped || !isRedaction && !isHint(types, type)) {
-            return convertColor(colors.getNotRedacted());
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
         }
-        return getColor(types, type);
+        return dictionaryService.getColor(type, dossierTemplateId);
     }
 
 
-    private float[] getColorForManualAdd(String type, Colors colors, AnnotationStatus status, List<Type> types) {
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {
 
         if (status.equals(AnnotationStatus.REQUESTED)) {
-            return convertColor(colors.getRequestAdd());
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
         } else if (status.equals(AnnotationStatus.DECLINED)) {
-            return convertColor(colors.getNotRedacted());
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
         }
-        return getColor(types, type);
+        return getColor(type, dossierTemplateId);
     }
 
 
-    private float[] getColor(List<Type> types, String type) {
+    private float[] getColor(String type, String dossierTemplateId) {
 
-        Optional<Type> foundType = types.stream().filter(t -> t.getType().equals(type)).findFirst();
-        if (foundType.isPresent()){
-            return convertColor(foundType.get().getHexColor());
-        }
-        return convertColor("#9398a0");
-    }
-
-
-    boolean isHint(List<Type> types, String type){
-        Optional<Type> foundType = types.stream().filter(t -> t.getType().equals(type)).findFirst();
-        if (foundType.isPresent()){
-            return foundType.get().isHint();
-        }
-       return false;
-    }
-
-
-    private float[] convertColor(String hex) {
-
-        Color color = Color.decode(hex);
-        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
+        return dictionaryService.getColor(type, dossierTemplateId);
     }
 
 
@@ -408,5 +375,6 @@ public class RedactionLogMergeService {
 
     }
 
+
 }
 

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

@@ -1,5 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.redaction.v1.model.CellRectangle;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.SectionRectangle;
@@ -9,11 +14,8 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor

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

@@ -1,19 +1,35 @@
 package com.iqser.red.service.redaction.v1.server.redaction.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.*;
-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 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 java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
+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.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Service

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

@@ -28,7 +28,7 @@ public class SurroundingWordsService {
         try {
             for (Entity entity : entities) {
 
-                if (dictionary != null && dictionary.isHint(entity.getType())) {
+                if (dictionary.isHint(entity.getType())) {
                     continue;
                 }
                 findSurroundingWords(entity, searchableText.toString(), entity.getStart(), entity.getEnd());
@@ -64,7 +64,7 @@ public class SurroundingWordsService {
                     String text = searchableString.substring(startOffset, endOffset);
                     for (Entity entity : entities) {
 
-                        if (dictionary != null && dictionary.isHint(entity.getType())) {
+                        if (dictionary.isHint(entity.getType())) {
                             continue;
                         }
 

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

@@ -1,30 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 @Slf4j
 @UtilityClass
 @SuppressWarnings("PMD")
@@ -48,7 +37,8 @@ public class EntitySearchUtils {
                 startIndex = inputString.indexOf(cleanValue, stopIndex);
                 stopIndex = startIndex + cleanValue.length();
 
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
                     return true;
                 }
             } while (startIndex > -1);
@@ -57,34 +47,16 @@ public class EntitySearchUtils {
     }
 
 
-    public Set<Entity> findEntities(String inputString, Set<String> values, DictionaryModel type, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionary,
-                                    Engine engine, boolean ignoreMinLength, boolean asRecommendation) {
+    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
+                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine) {
 
-       Set<Entity> found = find(inputString, values, type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY);
-
-       if(asRecommendation){
-           Set<Entity> falseRecommendations = find(inputString, type.getFalseRecommendationValues(), type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, EntityType.FALSE_RECOMMENDATION);
-           removeFalsePositives(found, falseRecommendations);
-           found.addAll(falseRecommendations);
-       } else {
-           Set<Entity> falsePositives = find(inputString, type.getFalsePositiveValues(), type.getType(),  headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, ignoreMinLength, EntityType.FALSE_POSITIVE);
-           removeFalsePositives(found, falsePositives);
-           found.addAll(falsePositives);
-       }
-
-       return found;
-    }
-
-
-    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionary,
-                                    Engine engine, boolean ignoreMinLength, EntityType entityType) {
         Set<Entity> found = new HashSet<>();
 
         for (String value : values) {
 
             String cleanValue = value.trim();
 
-            if (!ignoreMinLength && cleanValue.length() <= 2) {
+            if (cleanValue.length() <= 2) {
                 continue;
             }
 
@@ -94,8 +66,9 @@ public class EntitySearchUtils {
                 startIndex = inputString.indexOf(cleanValue, stopIndex);
                 stopIndex = startIndex + cleanValue.length();
 
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString.charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine, entityType));
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, isDictionaryEntry, isDossierDictionary, engine));
                 }
             } while (startIndex > -1);
         }
@@ -103,7 +76,6 @@ public class EntitySearchUtils {
     }
 
 
-
     private boolean isSeparator(char c) {
 
         return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
@@ -120,10 +92,13 @@ public class EntitySearchUtils {
 
         for (String word : entitiesByWord.keySet()) {
 
-            List<Entity> orderedEntities = entitiesByWord.get(word).stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
+            List<Entity> orderedEntities = entitiesByWord.get(word)
+                    .stream()
+                    .sorted(Comparator.comparing(Entity::getStart))
+                    .collect(Collectors.toList());
             Entity firstEntity = orderedEntities.get(0);
             List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
-                    .trim(), dictionary == null || dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
+                    .trim(), dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());
 
             for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                 try {
@@ -140,69 +115,19 @@ public class EntitySearchUtils {
     }
 
 
-
-    public void removeFalsePositives(Set<Entity> entities, Set<Entity> falsePositives) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity word : falsePositives) {
-            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
-                        wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-        entities.removeAll(falsePositives);
-    }
-
-
-
-
     public void removeEntitiesContainedInLarger(Set<Entity> entities) {
 
         List<Entity> wordsToRemove = new ArrayList<>();
         for (Entity word : entities) {
             for (Entity inner : entities) {
                 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) && word.getEntityType().equals(EntityType.ENTITY)) {
-                        wordsToRemove.add(word);
-                    } else {
-                        wordsToRemove.add(inner);
-                    }
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
+                    wordsToRemove.add(inner);
                 }
             }
         }
-        wordsToRemove.stream().filter(e -> !e.getEntityType().equals(EntityType.FALSE_POSITIVE) && !e.getEntityType().equals(EntityType.FALSE_RECOMMENDATION)).forEach(entities::remove);
-    }
-
-
-    public static void removeEntitiesContainedInRedactedLogos(Map<Integer, Set<Image>> imagesPerPage, Map<Integer, List<Entity>> entitiesPerPage) {
-
-        if (entitiesPerPage != null && imagesPerPage != null) {
-            for (int page : imagesPerPage.keySet()) {
-                Set<Entity> removeEntitiesFromPage = new HashSet<>();
-
-                if (!entitiesPerPage.containsKey(page)) {
-                    continue;
-                }
-                imagesPerPage.get(page).forEach(image -> {
-                    if (image.isRedaction()) {
-                        entitiesPerPage.get(page).forEach(entity -> {
-                            if (isImageOverlappingEntity(image, entity)) {
-                                log.info("Logo overlaps entity and entity will be removed");
-                                removeEntitiesFromPage.add(entity);
-                            }
-
-                        });
-                    }
-                });
-
-                entitiesPerPage.get(page).removeAll(removeEntitiesFromPage);
-
-            }
-        }
+        entities.removeAll(wordsToRemove);
     }
 
 
@@ -216,14 +141,14 @@ public class EntitySearchUtils {
 
         if (entities.contains(found)) {
             Optional<Entity> existingOptional = entities.stream().filter(entity -> entity.equals(found)).findFirst();
-            if (!existingOptional.isPresent()) {
+            if(!existingOptional.isPresent()){
                 return;
             }
             var existing = existingOptional.get();
 
-            if (existing.getType().equals(found.getType())) {
+            if(existing.getType().equals(found.getType())){
                 existing.getEngines().addAll(found.getEngines());
-            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
+            } else if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){
                 entities.remove(found);
                 entities.add(found);
             }
@@ -240,42 +165,12 @@ public class EntitySearchUtils {
     }
 
 
-    private boolean isImageOverlappingEntity(Image image, Entity entity) {
+    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded){
 
-        return image.getPosition() != null && entity.getPositionSequences() != null && entity.getPositionSequences().get(0) != null && entity.getPositionSequences()
-                .get(0)
-                .getSequences() != null && entity.getPositionSequences().get(0).getSequences().get(0) != null && image.getPosition().getX() < entity.getPositionSequences()
-                .get(0)
-                .getSequences()
-                .get(0)
-                .getX1() && image.getPosition().getX() + image.getPosition().getWidth() > entity.getPositionSequences().get(0).getSequences().get(0).getX2() && image.getPosition()
-                .getY() < entity.getPositionSequences().get(0).getSequences().get(0).getY1() && image.getPosition().getY() + image.getPosition()
-                .getHeight() > entity.getPositionSequences().get(0).getSequences().get(0).getY2();
-    }
-
-
-    public Set<Entity> findNonOverlappingMatchEntities(Set<Entity> existingEntities, Set<Entity> foundEntities) {
-
-        Set<Entity> result = new HashSet<>();
-        if (existingEntities != null && foundEntities != null) {
-            for (Entity foundEntity : foundEntities) {
-
-                if (!overlaps(existingEntities, foundEntity)) {
-                    result.add(foundEntity);
-                }
-
-            }
-        }
-        return result;
-    }
-
-
-    public void addOrAddEngine(Set<Entity> existing, Set<Entity> toBeAdded) {
-
-        for (Entity toAdd : toBeAdded) {
+        for(Entity toAdd: toBeAdded){
             if (existing.contains(toAdd)) {
-                Optional<Entity> existingOptional = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
-                if (!existingOptional.isPresent()) {
+                Optional<Entity> existingOptional  = existing.stream().filter(entity -> entity.equals(toAdd)).findFirst();
+                if(!existingOptional.isPresent()){
                     return;
                 }
                 var existingEntity = existingOptional.get();
@@ -286,24 +181,4 @@ public class EntitySearchUtils {
         }
     }
 
-
-    private boolean overlaps(Set<Entity> existingEntities, Entity found) {
-
-        for (Entity existing : existingEntities) {
-
-            if (existing.getStart().equals(found.getStart())) {
-                continue;
-            }
-
-            for (int i = existing.getStart(); i <= existing.getEnd(); i++) {
-                for (int j = found.getStart(); j <= found.getEnd(); j++) {
-                    if (i == j) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
 }

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

@@ -0,0 +1,165 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageMergeService {
+
+
+    public List<PdfImage> mergeImages(List<PdfImage> images, int rotation){
+
+        List<PdfImage> mergedList = processImages(images, rotation);
+
+        List<PdfImage> imagesInImage = new ArrayList<>();
+        for(PdfImage image: mergedList){
+            for (PdfImage inner: mergedList){
+                if(image != inner && image.getPosition().contains(inner.getPosition().getX(), inner.getPosition().getY(), inner.getPosition().getWidth(), inner.getPosition().getHeight())){
+                    imagesInImage.add(inner);
+                }
+            }
+        }
+        mergedList.removeAll(imagesInImage);
+
+        return mergedList;
+    }
+
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList, int rotation) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList, rotation);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1), rotation);
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2, int rotation) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double width2 = image2.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), rotation == 90 ? width + width2: width, rotation == 90 ? height1 : height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage(), image1.isHasTransparency() || image2.isHasTransparency());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
+        }
+
+
+    }
+
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList, int rotation) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i), rotation));
+            }
+        }
+        return candidatesList;
+    }
+
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2, int rotation) {
+        double x1 = rotation == 90 ? image1.getPosition().getY() : image1.getPosition().getX();
+        double y1 = rotation == 90 ? image1.getPosition().getX() : image1.getPosition().getY();
+        double width1 = rotation == 90 ? image1.getPosition().getHeight() : image1.getPosition().getWidth();
+        double x2 = rotation == 90 ? image2.getPosition().getY() : image2.getPosition().getX();
+        double y2 = rotation == 90 ? image2.getPosition().getX() : image2.getPosition().getY();
+        double width2 = rotation == 90 ? image2.getPosition().getHeight() : image2.getPosition().getWidth();
+        double height2 = rotation == 90 ? image2.getPosition().getWidth() : image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(rotation == 90 ? y2 - y1 : y1 - y2) && width2 > (height2 / 6);
+    }
+
+}

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

@@ -1,63 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.segmentation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-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.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-
-@Service
-@RequiredArgsConstructor
-public class ImageService {
-
-    private final ObjectMapper objectMapper;
-    private final RedactionStorageService redactionStorageService;
-
-    @SneakyThrows
-    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().stream().forEach(imageMetadata -> {
-            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)) : ImageType.OTHER;
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification, imageMetadata.getPosition().getPageNumber()));
-        });
-
-        return images;
-    }
-
-
-    public void findOcr(Page page){
-        page.getImages().forEach(image -> {
-            if (image.getImageType().equals(ImageType.OTHER)) {
-                page.getTextBlocks().forEach(textblock -> {
-                    if (image.getPosition()
-                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
-                        image.setImageType(ImageType.OCR);
-                    }
-                });
-            }
-        });
-    }
-
-
-}

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

@@ -10,7 +10,6 @@ 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;
@@ -30,6 +29,7 @@ import com.iqser.red.service.redaction.v1.server.memory.MemoryStats;
 import com.iqser.red.service.redaction.v1.server.parsing.PDFLinesTextStripper;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
@@ -50,10 +50,17 @@ public class PdfSegmentationService {
     private final BlockificationService blockificationService;
     private final ClassificationService classificationService;
     private final SectionsBuilderService sectionsBuilderService;
-    private final ImageService imageService;
+    private final ImageClassificationService imageClassificationService;
+    private final ImageMergeService imageMergeService;
 
 
-    public Document parseDocument(InputStream documentInputStream, Map<Integer, List<PdfImage>> pdfImages) throws IOException {
+    public Document parseDocument(InputStream documentInputStream) throws IOException {
+
+        return parseDocument(documentInputStream, false);
+    }
+
+
+    public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
 
         PDDocument pdDocument = null;
         try {
@@ -115,14 +122,15 @@ public class PdfSegmentationService {
                     page.setLandscape(isLandscape || isRotated);
                     page.setPageNumber(pageNumber);
 
+                    List<PdfImage> mergedList = imageMergeService.mergeImages(stripper.getImages(), rotation);
+                    page.setImages(mergedList);
 
                     tableExtractionService.extractTables(cleanRulings, page);
                     buildPageStatistics(page);
                     increaseDocumentStatistics(page, document);
 
-                    if (pdfImages != null && pdfImages.containsKey(pageNumber)) {
-                        page.setImages(pdfImages.get(pageNumber));
-                        imageService.findOcr(page);
+                    if (!ignoreImages) {
+                        imageClassificationService.classifyImages(page);
                     }
 
                     pages.add(page);

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

@@ -211,11 +211,7 @@ public class SectionsBuilderService {
                 if (previous != null && previous.getText().startsWith("Table ")) {
                     table.setHeadline(previous.getText());
                 } else {
-                    if(lastHeadline == null || lastHeadline.isEmpty()) {
-                        table.setHeadline("Text in table");
-                    } else {
-                        table.setHeadline("Table in: " + lastHeadline);
-                    }
+                    table.setHeadline("Table in: " + lastHeadline);
                 }
 
                 if (textBlock != null && !alreadyAdded) {

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

@@ -1,8 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.settings;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
 @ConfigurationProperties("redaction-service")
@@ -18,8 +17,6 @@ public class RedactionServiceSettings {
 
     private int analysisVersion = 1;
 
-    private boolean nerServiceEnabled = true;
-
-    private boolean priorityMode;
+    private boolean enableEntityRecognition = true;
 
 }

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

@@ -1,26 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.storage;
 
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
-import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageService;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 @Slf4j
 @Service
@@ -30,39 +26,18 @@ public class RedactionStorageService {
     private final ObjectMapper objectMapper;
     private final StorageService storageService;
 
-
     @SneakyThrows
     public InputStream getStoredObject(String storageId) {
-
         return storageService.getObject(storageId).getInputStream();
     }
 
 
     @SneakyThrows
     public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
-
         storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), objectMapper.writeValueAsBytes(any));
     }
 
 
-    public ImportedRedactions getImportedRedactions(String dossierId, String fileId) {
-
-        InputStreamResource inputStreamResource;
-        try {
-            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMPORTED_REDACTIONS));
-        } catch (StorageObjectDoesNotExist e) {
-            log.debug("Imported redactions not available.");
-            return null;
-        }
-
-        try {
-            return objectMapper.readValue(inputStreamResource.getInputStream(), ImportedRedactions.class);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not imported redactions", e);
-        }
-    }
-
-
     public RedactionLog getRedactionLog(String dossierId, String fileId) {
 
         InputStreamResource inputStreamResource;
@@ -105,24 +80,24 @@ public class RedactionStorageService {
         try {
             inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.NER_ENTITIES));
         } catch (StorageObjectDoesNotExist e) {
-            throw new NotFoundException("NER Entities are not available.");
+            log.debug("NER Entities not available.");
+            return null;
         }
 
         try {
             return objectMapper.readValue(inputStreamResource.getInputStream(), NerEntities.class);
         } catch (IOException e) {
-            throw new RuntimeException("Could not convert NER Entities", e);
+            throw new RuntimeException("Could not convert NerEntities", e);
         }
     }
 
 
+
     public SectionGrid getSectionGrid(String dossierId, String fileId) {
 
+        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
         try {
-            var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(dossierId, fileId, FileType.SECTION_GRID));
             return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
-        } catch (StorageObjectDoesNotExist e) {
-            throw new NotFoundException("Section Grid is not available.");
         } catch (IOException e) {
             throw new RuntimeException("Could not convert RedactionLog", e);
         }
@@ -141,10 +116,8 @@ public class RedactionStorageService {
     public static class StorageIdUtils {
 
         public static String getStorageId(String dossierId, String fileId, FileType fileType) {
-
             return dossierId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
         }
 
     }
-
 }

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

@@ -9,7 +9,6 @@ import org.junit.Test;
 
 import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
 
 public class EntitySearchUtilsTest {
 
@@ -17,8 +16,8 @@ public class EntitySearchUtilsTest {
     public void testNestedEntitiesRemoval() {
 
         Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false, false, Engine.RULE);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false, false, Engine.RULE);
         entities.add(nested);
         entities.add(nesting);
         EntitySearchUtils.removeEntitiesContainedInLarger(entities);
@@ -28,162 +27,4 @@ public class EntitySearchUtilsTest {
 
     }
 
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman Y.", "fake type", 10, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(2);
-        assertThat(result).contains(foundEntities1);
-        assertThat(result).contains(foundEntities2);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEndOverlapping() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman Y.", "fake type", 7, 20, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedStartAndEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE,EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(1);
-        assertThat(result).contains(foundEntities1);
-
-    }
-
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedExistingAndExpandedEnd() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X.", "fake type", 0, 8, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(0);
-
-    }
-
-    /*
-     * Text:     Batman X. Superman Y.
-     * Position: 0123456789
-     *                     0123456789
-     *                               0123456789
-     */
-    @Test
-    public void testNotOverlappingEntitiesExpandedEndLong() {
-
-        // Arrange
-        Set<Entity> existingEntities = new HashSet<>();
-        Entity existingEntity1 = new Entity("X. Superman", "fake type", 7, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity existingEntity2 = new Entity("Batman", "fake type", 0, 5, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        existingEntities.add(existingEntity1);
-        existingEntities.add(existingEntity2);
-
-        Set<Entity> foundEntities = new HashSet<>();
-        Entity foundEntities1 = new Entity("Batman X. Superman", "fake type", 0, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        Entity foundEntities2 = new Entity("Superman", "fake type", 10, 17, "fake headline", 0, false, false, Engine.RULE, EntityType.ENTITY);
-        foundEntities.add(foundEntities1);
-        foundEntities.add(foundEntities2);
-
-        // Act
-        Set<Entity> result = EntitySearchUtils.findNonOverlappingMatchEntities(existingEntities, foundEntities);
-
-        // Assert
-        assertThat(result.size()).isEqualTo(0);
-
-    }
-
 }

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

@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class OsUtils {
-
-    public static boolean isWindows() {
-
-        return StringUtils.containsIgnoreCase(System.getProperty("os.name"), "Windows");
-    }
-
-
-    public static String getTemporaryDirectory() {
-
-        String tmpdir = System.getProperty("java.io.tmpdir");
-        if (isWindows() && StringUtils.isNotBlank(tmpdir)) {
-            return tmpdir;
-        }
-        return "/tmp";
-    }
-
-}

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

@@ -1,16 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
 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;
@@ -35,18 +31,12 @@ 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;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -77,29 +67,42 @@ public class PdfSegmentationServiceTest {
     @MockBean
     private LegalBasisClient legalBasisClient;
 
-    @Autowired
-    private ObjectMapper objectMapper;
-
     @Configuration
     @EnableAutoConfiguration(exclude = { RabbitAutoConfiguration.class})
     public static class TestConfiguration {
 
     }
 
+    @Test
+    public void testMergeImages() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/270Rotated.pdf");
+
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        assertThat(document.getPages().get(0).getImages().size()).isEqualTo(1);
+        assertThat(document.getPages().get(1).getImages().size()).isEqualTo(0);
+
+    }
 
     @Test
-    @SneakyThrows
-    public void testMapping(){
-        ClassPathResource responseJson = new ClassPathResource("files/image_response.json");
-        ImageServiceResponse imageServiceResponse = objectMapper.readValue(responseJson.getInputStream(), ImageServiceResponse.class);
+    @Ignore
+    public void testExtractImages() throws IOException {
 
-        Map<Integer, List<PdfImage>> images = new HashMap<>();
-        imageServiceResponse.getData().stream().forEach(imageMetadata -> {
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)), imageMetadata.getPosition().getPageNumber()));
-        });
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
 
-        System.out.println("object");
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
+        int i = 0;
+        for (Page page : document.getPages()) {
+            for (PdfImage image : page.getImages()) {
+                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                    ImageIO.write(image.getImage(), "png", baos);
+                    try (FileOutputStream fileOutputStream = new FileOutputStream(getTemporaryDirectory() + "/Image " + i + ".png")) {
+                        fileOutputStream.write(baos.toByteArray());
+                    }
+                }
+                i++;
+            }
+        }
     }
 
 
@@ -108,7 +111,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Spanning Cells.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -129,7 +132,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -167,7 +170,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Multi Page Table.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -205,7 +208,7 @@ public class PdfSegmentationServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Rotated Table Headers.pdf");
 
-        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream(), null);
+        Document document = pdfSegmentationService.parseDocument(pdfFileResource.getInputStream());
         assertThat(document.getParagraphs()
                 .stream()
                 .flatMap(paragraph -> paragraph.getTables().stream())
@@ -237,5 +240,12 @@ public class PdfSegmentationServiceTest {
                         .equals(firstTableHeaderCells))).isTrue();
     }
 
+    private static String getTemporaryDirectory() {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        if (StringUtils.isNotBlank(tmpdir)) {
+            return tmpdir;
+        }
+        return "/tmp";
+    }
 
 }

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

@@ -17,7 +17,7 @@ platform.multi-tenancy:
 
 redaction-service:
   enable-image-classification: false
-  enable-entity-recognition: true
+  enable-entity-recognition: false
 
 storage:
   signer-type: 'AWSS3V4SignerType'

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

@@ -1660,4 +1660,3 @@ Zyma SA
 Zyma SA, Nyon, Switzerland
 Mambo-Tox Ltd. Biomedical Sciences Building Bassett Crescent East Southampton SO16 7PX UK
 Syngenta Environmental Sciences Jealott’s Hill International Research Centre Bracknell, Berkshire RG42 6EY UK
-Test Ignored Hint CBI_ADDRESS

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

@@ -1,6 +1,5 @@
 Foo
 F. Bar
-B. Foo
 Johnson R |
 Weissler M S and Butters C A
 AD Hurt
@@ -8615,9 +8614,4 @@ Zoriki Hosomi R.
 Zoriki Hosomi Rosana
 Zuberer D
 Zubrod J
-Zwicker R.E.
-Doe
-M. Mustermann
-F. Lastname
-Mustermann
-Lastname
+Zwicker R.E.

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

@@ -3,9 +3,3 @@ Report Number: 33168
 Page
 Report Number: BFI0714
 Tesh Consultants International
-B. Rahim
-C. J. Alfred
-Naka-27 Aomachi, Nomi, Ishikawa 923-1101, Japan, JP
-Özgür U. Reyhan
-Sude Halide Nurullah
-Xinyi Y. Tao

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

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

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

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

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

@@ -85,4 +85,3 @@ Toxicology and Applied Pharmacology
 Toxicol Sci
 Toxicol Sci.
 Toxicol Sci. 1
-Test Ignored Hint Published Information

redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl

@@ -9,31 +9,18 @@ global Section section
 
 //rule "0: Expand CBI Authors with firstname initials"
 //    when
-//        Section(matchesType("CBI_author"))
+//        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
 //    then
 //        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
+//        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1);
 //    end
 
-
-rule "0: Add CBI_author from ai"
-    when
-        Section(aiMatchesType("CBI_author"))
-    then
-        section.addAiEntities("CBI_author", "CBI_author");
-    end
-
-rule "0: Combine ai types CBI_author from ai"
-    when
-        Section(aiMatchesType("ORG"))
-    then
-        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "CBI_address", 3, false);
-    end
-
 rule "0: Expand CBI Authors with firstname initials"
     when
-        Section(matchesType("CBI_author"))
+        Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))
     then
-        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[^\\s]+");
+        section.expandByRegEx("CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[\\s]+");
+        section.expandByRegEx("recommendation_CBI_author", "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)", false, 1, "[\\s]+");
     end
 
 
@@ -357,11 +344,4 @@ rule "29: Redact Dossier Redactions"
          Section(matchesType("dossier_redactions"))
      then
          section.redact("dossier_redactions", 29, "Dossier Redaction found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-     end
-
-rule "30: Ignore dossier_redactions if confidential"
-    when
-        Section(!fileAttributeByLabelEqualsIgnoreCase("Confidentiality","confidential") && matchesType("dossier_redactions"));
-    then
-        section.ignore("dossier_redactions");
-    end
+     end

redaction-service-v1/redaction-service-server-v1/src/test/resources/files/ImportedRedactions/ImportedRedactions.json

@@ -1 +0,0 @@
-{"importedRedactions":{"1":[{"id":"755273b5ddc6933eff7f6b6e055c803f","positions":[{"topLeft":{"x":275.0,"y":520.504},"width":55.675,"height":15.582,"page":1}]},{"id":"5e517d2c890272fc140578a26971b459","positions":[{"topLeft":{"x":164.0,"y":316.492},"width":50.7,"height":15.658,"page":1},{"topLeft":{"x":127.0,"y":302.613},"width":119.675,"height":14.902,"page":1},{"topLeft":{"x":81.0,"y":289.622},"width":210.025,"height":14.846,"page":1},{"topLeft":{"x":136.0,"y":275.912},"width":94.2,"height":13.033,"page":1},{"topLeft":{"x":158.0,"y":261.402},"width":52.793,"height":16.218,"page":1},{"topLeft":{"x":177.0,"y":247.413},"width":15.507,"height":16.148,"page":1}]}]}}

redaction-service-v1/redaction-service-server-v1/src/test/resources/files/crafted_document.NER_ENTITIES.json

@@ -1,872 +0,0 @@
-{
-  "result": {
-    "1": [
-      {
-        "value": "Lastname, J.",
-        "startOffset": 54,
-        "endOffset": 66,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Doe, M.",
-        "startOffset": 67,
-        "endOffset": 74,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Mustermann Lastname M.",
-        "startOffset": 75,
-        "endOffset": 97,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Doe J. Mustermann M.",
-        "startOffset": 99,
-        "endOffset": 119,
-        "type": "CBI_author"
-      }
-    ],
-    "2": [
-      {
-        "value": "Eikenboom Charalampos",
-        "startOffset": 148,
-        "endOffset": 169,
-        "type": "ORG"
-      },
-      {
-        "value": "Schenk Tanja Schmitt ←",
-        "startOffset": 170,
-        "endOffset": 192,
-        "type": "ORG"
-      }
-    ],
-    "3": [
-      {
-        "value": "Rue Jean Baffier",
-        "startOffset": 214,
-        "endOffset": 230,
-        "type": "CBI_author"
-      },
-      {
-        "value": "7232",
-        "startOffset": 155,
-        "endOffset": 159,
-        "type": "POSTAL"
-      },
-      {
-        "value": "CX",
-        "startOffset": 160,
-        "endOffset": 162,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Warnsveld",
-        "startOffset": 163,
-        "endOffset": 172,
-        "type": "CITY"
-      },
-      {
-        "value": "Netherlands",
-        "startOffset": 174,
-        "endOffset": 185,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "NL",
-        "startOffset": 187,
-        "endOffset": 189,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Institut Industries",
-        "startOffset": 190,
-        "endOffset": 209,
-        "type": "ORG"
-      },
-      {
-        "value": "33",
-        "startOffset": 211,
-        "endOffset": 213,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Rue Jean Baffier",
-        "startOffset": 214,
-        "endOffset": 230,
-        "type": "STREET"
-      },
-      {
-        "value": "18000",
-        "startOffset": 232,
-        "endOffset": 237,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Bourges",
-        "startOffset": 238,
-        "endOffset": 245,
-        "type": "CITY"
-      },
-      {
-        "value": "France",
-        "startOffset": 247,
-        "endOffset": 253,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "18300",
-        "startOffset": 282,
-        "endOffset": 287,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Saint-Satur",
-        "startOffset": 288,
-        "endOffset": 299,
-        "type": "CITY"
-      },
-      {
-        "value": "France",
-        "startOffset": 301,
-        "endOffset": 307,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Lesdo Industries",
-        "startOffset": 312,
-        "endOffset": 328,
-        "type": "ORG"
-      },
-      {
-        "value": "Chäppelisträssli",
-        "startOffset": 330,
-        "endOffset": 346,
-        "type": "ORG"
-      },
-      {
-        "value": "6078",
-        "startOffset": 348,
-        "endOffset": 352,
-        "type": "POSTAL"
-      },
-      {
-        "value": "Lungern",
-        "startOffset": 353,
-        "endOffset": 360,
-        "type": "STREET"
-      },
-      {
-        "value": "Switzerland",
-        "startOffset": 362,
-        "endOffset": 373,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Shlissel'burgskaya Ulitsa",
-        "startOffset": 374,
-        "endOffset": 399,
-        "type": "ORG"
-      },
-      {
-        "value": "Nizhny Novgorod Oblast",
-        "startOffset": 401,
-        "endOffset": 423,
-        "type": "STREET"
-      },
-      {
-        "value": "Russia",
-        "startOffset": 425,
-        "endOffset": 431,
-        "type": "CITY"
-      },
-      {
-        "value": "603034",
-        "startOffset": 433,
-        "endOffset": 439,
-        "type": "POSTAL"
-      },
-      {
-        "value": "RU",
-        "startOffset": 441,
-        "endOffset": 443,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Karl Johans Gate",
-        "startOffset": 444,
-        "endOffset": 460,
-        "type": "STREET"
-      },
-      {
-        "value": "11",
-        "startOffset": 461,
-        "endOffset": 463,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "0154",
-        "startOffset": 465,
-        "endOffset": 469,
-        "type": "POSTAL"
-      },
-      {
-        "value": "Oslo",
-        "startOffset": 470,
-        "endOffset": 474,
-        "type": "CITY"
-      },
-      {
-        "value": "Norway",
-        "startOffset": 476,
-        "endOffset": 482,
-        "type": "COUNTRY"
-      }
-    ],
-    "4": [
-      {
-        "value": "Expand",
-        "startOffset": 67,
-        "endOffset": 73,
-        "type": "STATE"
-      },
-      {
-        "value": "Hint Clarissa",
-        "startOffset": 77,
-        "endOffset": 90,
-        "type": "ORG"
-      },
-      {
-        "value": "Dict",
-        "startOffset": 114,
-        "endOffset": 118,
-        "type": "ORG"
-      },
-      {
-        "value": "Authors-Dict",
-        "startOffset": 171,
-        "endOffset": 183,
-        "type": "ORG"
-      }
-    ],
-    "6": [
-      {
-        "value": "Michael N.",
-        "startOffset": 7,
-        "endOffset": 17,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Weyland Industries",
-        "startOffset": 76,
-        "endOffset": 94,
-        "type": "ORG"
-      }
-    ],
-    "7": [
-      {
-        "value": "Funnarie B.",
-        "startOffset": 7,
-        "endOffset": 18,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Authentic Diagnostics",
-        "startOffset": 73,
-        "endOffset": 94,
-        "type": "ORG"
-      }
-    ],
-    "8": [
-      {
-        "value": "Feuer A.",
-        "startOffset": 6,
-        "endOffset": 14,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Tyrell Corporation",
-        "startOffset": 74,
-        "endOffset": 92,
-        "type": "ORG"
-      }
-    ],
-    "12": [
-      {
-        "value": "Melanie",
-        "startOffset": 292,
-        "endOffset": 299,
-        "type": "CBI_author"
-      }
-    ],
-    "13": [
-      {
-        "value": "Stark Industries",
-        "startOffset": 184,
-        "endOffset": 200,
-        "type": "ORG"
-      }
-    ],
-    "14": [
-      {
-        "value": "Omni Consumer Products Do",
-        "startOffset": 197,
-        "endOffset": 222,
-        "type": "ORG"
-      }
-    ],
-    "15": [
-      {
-        "value": "Omni Consumer Products Do",
-        "startOffset": 122,
-        "endOffset": 147,
-        "type": "ORG"
-      }
-    ],
-    "16": [
-      {
-        "value": "Asya Lyon",
-        "startOffset": 253,
-        "endOffset": 262,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Carina Madsen",
-        "startOffset": 264,
-        "endOffset": 277,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Alexandra Häusler",
-        "startOffset": 279,
-        "endOffset": 296,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Hanke Mendel",
-        "startOffset": 298,
-        "endOffset": 310,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Kwok, Jun K.",
-        "startOffset": 444,
-        "endOffset": 456,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Tu Wong",
-        "startOffset": 458,
-        "endOffset": 465,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Qiang Suen",
-        "startOffset": 467,
-        "endOffset": 477,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Zhou Mah",
-        "startOffset": 479,
-        "endOffset": 487,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Lei W. Huang",
-        "startOffset": 499,
-        "endOffset": 511,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Ru X.",
-        "startOffset": 513,
-        "endOffset": 518,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Oxford University Press",
-        "startOffset": 166,
-        "endOffset": 189,
-        "type": "ORG"
-      },
-      {
-        "value": "Iakovos Geiger",
-        "startOffset": 222,
-        "endOffset": 236,
-        "type": "ORG"
-      },
-      {
-        "value": "Julian Ritter",
-        "startOffset": 238,
-        "endOffset": 251,
-        "type": "CITY"
-      },
-      {
-        "value": "Asya Lyon",
-        "startOffset": 253,
-        "endOffset": 262,
-        "type": "ORG"
-      },
-      {
-        "value": "Carina Madsen",
-        "startOffset": 264,
-        "endOffset": 277,
-        "type": "CITY"
-      },
-      {
-        "value": "Alexandra Häusler",
-        "startOffset": 279,
-        "endOffset": 296,
-        "type": "ORG"
-      },
-      {
-        "value": "Hanke Mendel",
-        "startOffset": 298,
-        "endOffset": 310,
-        "type": "ORG"
-      },
-      {
-        "value": "Ranya",
-        "startOffset": 312,
-        "endOffset": 317,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Eikenboom",
-        "startOffset": 318,
-        "endOffset": 327,
-        "type": "ORG"
-      },
-      {
-        "value": "Min Kwok",
-        "startOffset": 440,
-        "endOffset": 448,
-        "type": "ORG"
-      },
-      {
-        "value": "Qiang Suen",
-        "startOffset": 467,
-        "endOffset": 477,
-        "type": "CITY"
-      },
-      {
-        "value": "Zhou Mah",
-        "startOffset": 479,
-        "endOffset": 487,
-        "type": "ORG"
-      },
-      {
-        "value": "Ning Liu",
-        "startOffset": 489,
-        "endOffset": 497,
-        "type": "STREET"
-      },
-      {
-        "value": "Lei W. Huang, Ru X. Wu",
-        "startOffset": 499,
-        "endOffset": 521,
-        "type": "ORG"
-      }
-    ],
-    "17": [
-      {
-        "value": "Nurullah Özgür",
-        "startOffset": 210,
-        "endOffset": 224,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Reyhan B.",
-        "startOffset": 228,
-        "endOffset": 237,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Alfred Xinyi Y.",
-        "startOffset": 250,
-        "endOffset": 265,
-        "type": "CBI_author"
-      },
-      {
-        "value": "Redacted",
-        "startOffset": 12,
-        "endOffset": 20,
-        "type": "ORG"
-      },
-      {
-        "value": "Aomachi",
-        "startOffset": 154,
-        "endOffset": 161,
-        "type": "ORG"
-      },
-      {
-        "value": "Nomi",
-        "startOffset": 163,
-        "endOffset": 167,
-        "type": "ORG"
-      },
-      {
-        "value": "Ishikawa",
-        "startOffset": 169,
-        "endOffset": 177,
-        "type": "CITY"
-      },
-      {
-        "value": "923-1101",
-        "startOffset": 178,
-        "endOffset": 186,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Japan",
-        "startOffset": 188,
-        "endOffset": 193,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "JP",
-        "startOffset": 195,
-        "endOffset": 197,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Sude Halide Nurullah Özgür U. Reyhan B. Rahim C. J. Alfred Xinyi Y. Tao Clara Siegfried",
-        "startOffset": 198,
-        "endOffset": 285,
-        "type": "ORG"
-      },
-      {
-        "value": "Dict",
-        "startOffset": 301,
-        "endOffset": 305,
-        "type": "ORG"
-      }
-    ],
-    "18": [
-      {
-        "value": "Redact Emails",
-        "startOffset": 12,
-        "endOffset": 25,
-        "type": "ORG"
-      }
-    ],
-    "19": [
-      {
-        "value": "Central Research Industry",
-        "startOffset": 274,
-        "endOffset": 299,
-        "type": "ORG"
-      },
-      {
-        "value": "Maximiliam Schmitt",
-        "startOffset": 530,
-        "endOffset": 548,
-        "type": "ORG"
-      },
-      {
-        "value": "European Central Institute",
-        "startOffset": 727,
-        "endOffset": 753,
-        "type": "ORG"
-      },
-      {
-        "value": "Emilia Lockhart Alternative",
-        "startOffset": 775,
-        "endOffset": 802,
-        "type": "ORG"
-      },
-      {
-        "value": "Cyberdyne Systems Tower",
-        "startOffset": 812,
-        "endOffset": 835,
-        "type": "ORG"
-      },
-      {
-        "value": "121a",
-        "startOffset": 844,
-        "endOffset": 848,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Hong Kong",
-        "startOffset": 849,
-        "endOffset": 858,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "BT",
-        "startOffset": 860,
-        "endOffset": 862,
-        "type": "COUNTRY"
-      }
-    ],
-    "21": [
-      {
-        "value": "Central Research Industry",
-        "startOffset": 270,
-        "endOffset": 295,
-        "type": "ORG"
-      },
-      {
-        "value": "Maximiliam Schmitt",
-        "startOffset": 526,
-        "endOffset": 544,
-        "type": "ORG"
-      },
-      {
-        "value": "European Central Institute",
-        "startOffset": 723,
-        "endOffset": 749,
-        "type": "ORG"
-      },
-      {
-        "value": "Emilia Lockhart Alternative",
-        "startOffset": 771,
-        "endOffset": 798,
-        "type": "ORG"
-      },
-      {
-        "value": "Cyberdyne Systems Tower",
-        "startOffset": 808,
-        "endOffset": 831,
-        "type": "ORG"
-      },
-      {
-        "value": "121a",
-        "startOffset": 840,
-        "endOffset": 844,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Hong Kong",
-        "startOffset": 845,
-        "endOffset": 854,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "BT",
-        "startOffset": 856,
-        "endOffset": 858,
-        "type": "COUNTRY"
-      }
-    ],
-    "22": [
-      {
-        "value": "Riddley",
-        "startOffset": 236,
-        "endOffset": 243,
-        "type": "ORG"
-      },
-      {
-        "value": "359-21",
-        "startOffset": 259,
-        "endOffset": 265,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Huam-dong",
-        "startOffset": 266,
-        "endOffset": 275,
-        "type": "STATE"
-      },
-      {
-        "value": "Yongsan-gu",
-        "startOffset": 276,
-        "endOffset": 286,
-        "type": "CITY"
-      },
-      {
-        "value": "Seoul",
-        "startOffset": 287,
-        "endOffset": 292,
-        "type": "CITY"
-      },
-      {
-        "value": "South Korea Phone",
-        "startOffset": 294,
-        "endOffset": 311,
-        "type": "COUNTRY"
-      },
-      {
-        "value": "Soylent Corporation",
-        "startOffset": 500,
-        "endOffset": 519,
-        "type": "ORG"
-      }
-    ],
-    "23": [
-      {
-        "value": "Umbrella Corporation",
-        "startOffset": 208,
-        "endOffset": 228,
-        "type": "ORG"
-      },
-      {
-        "value": "Jill",
-        "startOffset": 238,
-        "endOffset": 242,
-        "type": "ORG"
-      },
-      {
-        "value": "359-21",
-        "startOffset": 262,
-        "endOffset": 268,
-        "type": "CARDINAL"
-      },
-      {
-        "value": "Huam-dong",
-        "startOffset": 269,
-        "endOffset": 278,
-        "type": "STATE"
-      },
-      {
-        "value": "Yongsan-gu",
-        "startOffset": 279,
-        "endOffset": 289,
-        "type": "CITY"
-      },
-      {
-        "value": "Seoul",
-        "startOffset": 290,
-        "endOffset": 295,
-        "type": "CITY"
-      },
-      {
-        "value": "South Korea Phone",
-        "startOffset": 297,
-        "endOffset": 314,
-        "type": "COUNTRY"
-      }
-    ],
-    "26": [
-      {
-        "value": "Umbrella Corporation",
-        "startOffset": 209,
-        "endOffset": 229,
-        "type": "ORG"
-      }
-    ],
-    "28": [
-      {
-        "value": "Purity Hint",
-        "startOffset": 9,
-        "endOffset": 20,
-        "type": "ORG"
-      },
-      {
-        "value": "Hint",
-        "startOffset": 35,
-        "endOffset": 39,
-        "type": "ORG"
-      }
-    ],
-    "29": [
-      {
-        "value": "Ignore",
-        "startOffset": 9,
-        "endOffset": 15,
-        "type": "STREET"
-      }
-    ],
-    "30": [
-      {
-        "value": "Redact Signatures Redact",
-        "startOffset": 12,
-        "endOffset": 36,
-        "type": "ORG"
-      },
-      {
-        "value": "Dilara",
-        "startOffset": 139,
-        "endOffset": 145,
-        "type": "ORG"
-      },
-      {
-        "value": "Tobias Müller",
-        "startOffset": 197,
-        "endOffset": 210,
-        "type": "ORG"
-      }
-    ],
-    "31": [
-      {
-        "value": "Redact Logo Redact",
-        "startOffset": 9,
-        "endOffset": 27,
-        "type": "ORG"
-      }
-    ],
-    "41": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "42": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "43": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "44": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "45": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "46": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "47": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "48": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ],
-    "49": [
-      {
-        "value": "Page-Footer",
-        "startOffset": 10,
-        "endOffset": 21,
-        "type": "STREET"
-      }
-    ]
-  }
-}

redaction-service-v1/redaction-service-server-v1/src/test/resources/files/image_response.json

@@ -1,686 +0,0 @@
-{
-  "dossierId": "f889853e-4bf8-49a9-aae5-c38605c6ef40",
-  "fileId": "22ef63e29bb2a27db8497272336f6b32",
-  "data": [
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 1.0,
-          "signature": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 89.88,
-        "x2": 274.20000000000005,
-        "y1": 716.24,
-        "y2": 770.0,
-        "pageNumber": 1
-      },
-      "geometry": {
-        "width": 184.32000000000005,
-        "height": 53.75999999999999
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.14298074612038092,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 3.42857142857143,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999968,
-          "logo": 1.6e-05,
-          "other": 1.6e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 3
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0000782051152328,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999872,
-          "other": 7.9e-05,
-          "logo": 4.8e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 7
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0000782051152328,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.996366,
-          "other": 0.00,
-          "logo": 2.3e-05,
-          "formula": 4e-06
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": -0.10000600000000001,
-        "x2": 595.099994,
-        "y1": -0.07998660000000002,
-        "y2": 842.0800134,
-        "pageNumber": 8
-      },
-      "geometry": {
-        "width": 595.2,
-        "height": 842.16
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 1.0002630764355351,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.706754060986036,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.999772,
-          "logo": 0.000131,
-          "other": 9.7e-05,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 82.59443842482001,
-        "x2": 512.6365568843402,
-        "y1": 116.943736387567,
-        "y2": 725.0718450317352,
-        "pageNumber": 73
-      },
-      "geometry": {
-        "width": 430.04211845952017,
-        "height": 608.1281086441682
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.72236755521117,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7071571143427432,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 1.0,
-          "logo": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 328.20483600000006,
-        "x2": 393.94460940000005,
-        "y1": 175.1643178,
-        "y2": 203.92865619999998,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 65.73977339999999,
-        "height": 28.764338399999986
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.06142518774572455,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 2.2854609929078022,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 1.0,
-          "logo": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 136.5955818,
-        "x2": 224.72461859999999,
-        "y1": 175.1133172,
-        "y2": 203.97965680000001,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 88.1290368,
-        "height": 28.866339600000003
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.07124601312700823,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 3.053003533568904,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 1.0,
-          "signature": 0.0,
-          "other": 0.0,
-          "formula": 0.0
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 194.99126880000003,
-        "x2": 399.80967840000005,
-        "y1": 554.6597824,
-        "y2": 686.2413304,
-        "pageNumber": 81
-      },
-      "geometry": {
-        "width": 204.81840960000002,
-        "height": 131.581548
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.23189275858788796,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.5565891472868219,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.9945512,
-        "x2": 242.52382799999998,
-        "y1": 411.24609519999996,
-        "y2": 523.2434128,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 108.52927679999999,
-        "height": 111.99731760000003
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15573364968831904,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9690346083788703,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.5865464,
-        "x2": 242.3198256,
-        "y1": 274.972492,
-        "y2": 387.7858192,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 108.7332792,
-        "height": 112.8133272
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15644678522591335,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9638336347197106,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 246.19587120000003,
-        "x2": 356.5611696,
-        "y1": 400.84197279999995,
-        "y2": 519.3673672,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 110.3652984,
-        "height": 118.52539440000004
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.1615575178049721,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9311531841652321,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 244.9718568,
-        "x2": 358.3971912,
-        "y1": 274.972492,
-        "y2": 387.7858192,
-        "pageNumber": 90
-      },
-      "geometry": {
-        "width": 113.4253344,
-        "height": 112.8133272
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.15978662903260646,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.0054249547920433,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 254.9679744,
-        "x2": 371.6573472,
-        "y1": 439.6024288,
-        "y2": 564.0438928,
-        "pageNumber": 91
-      },
-      "geometry": {
-        "width": 116.6893728,
-        "height": 124.441464
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.17021718544102565,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.9377049180327869,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 133.9945512,
-        "x2": 249.663912,
-        "y1": 443.07046959999997,
-        "y2": 687.2613424,
-        "pageNumber": 91
-      },
-      "geometry": {
-        "width": 115.66936080000002,
-        "height": 244.19087280000002
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.23739910530627284,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.4736842105263158,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "other": 1.0,
-          "signature": 0.0,
-          "formula": 0.0,
-          "logo": 0.0
-        },
-        "label": "other"
-      },
-      "position": {
-        "x1": 105.84222,
-        "x2": 374.870385,
-        "y1": 526.40545,
-        "y2": 687.05734,
-        "pageNumber": 92
-      },
-      "geometry": {
-        "width": 269.028165,
-        "height": 160.65188999999998
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.2936614851112628,
-            "tooLarge": false,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 1.6746031746031749,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": true
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "logo": 0.788068,
-          "other": 0.152259,
-          "formula": 0.036883,
-          "signature": 0.02279
-        },
-        "label": "logo"
-      },
-      "position": {
-        "x1": 44.64999049990001,
-        "x2": 550.5759424999001,
-        "y1": 63.286004150029996,
-        "y2": 778.72242095003,
-        "pageNumber": 94
-      },
-      "geometry": {
-        "width": 505.92595200000005,
-        "height": 715.4364168000001
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.8498341845521462,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7071571143427431,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    },
-    {
-      "classification": {
-        "probabilities": {
-          "signature": 0.998335,
-          "logo": 0.000955,
-          "other": 0.000703,
-          "formula": 7e-06
-        },
-        "label": "signature"
-      },
-      "position": {
-        "x1": 58.954005540029996,
-        "x2": 536.45979618003,
-        "y1": 83.94401504006001,
-        "y2": 758.05854296006,
-        "pageNumber": 95
-      },
-      "geometry": {
-        "width": 477.50579064000004,
-        "height": 674.11452792
-      },
-      "filters": {
-        "geometry": {
-          "imageSize": {
-            "quotient": 0.8014221863697041,
-            "tooLarge": true,
-            "tooSmall": false
-          },
-          "imageFormat": {
-            "quotient": 0.7083452007974936,
-            "tooTall": false,
-            "tooWide": false
-          }
-        },
-        "probability": {
-          "unconfident": false
-        },
-        "allPassed": false
-      }
-    }
-  ]
-}

redaction-service-v1/redaction-service-server-v1/src/test/resources/files/ner_response.json

@@ -1,12 +0,0 @@
-{
-  "result": {
-    "1": [
-      {
-        "value": "Mannheim",
-        "startOffset": 0,
-        "endOffset": 8,
-        "type": "CITY"
-      }
-    ]
-  }
-}