Pull request #338: RED-3327: Ignore recommendations if touches other type

Merge in RED/redaction-service from RED-3327 to release/3.54.x

* commit '07ffd900582ada731a7381d825509ed5e656b70e':
  RED-3327: Ignore recommendations if touches other type

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/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,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.6.0</version>
+        <version>1.5.0</version>
         <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,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.149.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

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,48 +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 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.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

@@ -2,6 +2,6 @@ package com.iqser.red.service.redaction.v1.model;
 
 public enum MessageType {
 
-    ANALYSE, REANALYSE, STRUCTURE_ANALYSE, SURROUNDING_TEXT
+    FULL_ANALYSE, REANALYSE, SURROUNDING_TEXT
 
 }

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,20 +28,27 @@ 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 hasBeenResized;
+    private boolean hasBeenRecategorized;
+    private boolean hasLegalBasisChanged;
+    private boolean hasBeenForced;
+    private boolean hasBeenRemovedByManualOverride;
+
     private String section;
     private float[] color;
 
     @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;
@@ -48,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-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/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/controller/RedactionController.java

@@ -55,7 +55,8 @@ public class RedactionController implements RedactionResource {
 
     public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest
+                .getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
         var mergedRedactionLog = getRedactionLog(RedactionRequest.builder()
                 .fileId(annotateRequest.getFileId())
                 .manualRedactions(annotateRequest.getManualRedactions())
@@ -84,11 +85,13 @@ 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));
+        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));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
+                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                 pdDocument.setAllSecurityToBeRemoved(true);
 
@@ -110,11 +113,13 @@ public class RedactionController implements RedactionResource {
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
 
-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        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));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
+                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
             try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                 pdDocument.setAllSecurityToBeRemoved(true);
 
@@ -138,8 +143,9 @@ public class RedactionController implements RedactionResource {
         Document classifiedDoc;
 
         try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest
+                    .getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
         } catch (Exception e) {
             throw new RedactionException(e);
         }
@@ -169,7 +175,7 @@ public class RedactionController implements RedactionResource {
     @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());
@@ -180,7 +186,8 @@ public class RedactionController implements RedactionResource {
 
         log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
 
-        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
+        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest
+                .getFileId());
         if (sectionGrid.getSections().isEmpty()) {
 
             log.info("SectionGrid does not have headlines set. Computing headlines now!");
@@ -189,7 +196,8 @@ 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()
+                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText
+                                .getSectionAreas()
                                 .stream()
                                 .map(SectionArea::getPage)
                                 .collect(Collectors.toSet()), sectionText.getSectionAreas()));
@@ -198,7 +206,13 @@ public class RedactionController implements RedactionResource {
         }
 
         log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
-        return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+        if (redactionLog.getAnalysisVersion() == 0) {
+            // old redaction logs are returned directly
+            return redactionLog;
+        } else {
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest
+                    .getManualRedactions(), redactionRequest.getExcludedPages());
+        }
     }
 
 
@@ -220,9 +234,11 @@ public class RedactionController implements RedactionResource {
                                                @PathVariable("fileId") String fileId,
                                                @RequestBody ManualRedactions manualRedactions) {
 
+        long start = System.currentTimeMillis();
         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();
+        log.info("add surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, System
+                .currentTimeMillis() - start);
+        return result;
     }
 
 }

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

@@ -183,9 +183,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 graphicsPath.clear();
                 break;
 
-//            case OperatorName.DRAW_OBJECT:
-//                processImageOperation(arguments);
-//                break;
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
 
         }
 

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

@@ -389,7 +389,8 @@ public class PDFTextStripper extends LegacyPDFStreamEngine
                 }
             }
             characterListMapping.clear();
-            super.processPage(page);writePage();
+            super.processPage(page);
+            writePage();
             endPage(page);
         }
     }

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;
@@ -15,10 +8,18 @@ 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,6 +28,7 @@ public class RedactionMessageReceiver {
     private final ObjectMapper objectMapper;
     private final AnalyzeService analyzeService;
     private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+    private final NerAnalyserService nerAnalyserService;
     private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
 
 
@@ -38,26 +40,31 @@ public class RedactionMessageReceiver {
         log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
         AnalyzeResult result = null;
 
-        switch (analyzeRequest.getMessageType()) {
+        switch (analyzeRequest.getMessageType()){
 
             case REANALYSE:
                 result = analyzeService.reanalyze(analyzeRequest);
                 log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
                 break;
+            case FULL_ANALYSE:
+                // TODO Seperate stucture analysis by other queue
+                analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
 
-            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;
+                // 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 ANALYSE:
                 result = analyzeService.analyze(analyzeRequest);
-                log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
-                break;
+                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());
+                var manualRedactions = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
+                result = AnalyzeResult.builder()
+                        .dossierId(analyzeRequest.getDossierId())
+                        .fileId(analyzeRequest.getFileId())
+                        .manualRedactions(manualRedactions)
+                        .build();
                 break;
         }
 

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;

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

@@ -8,7 +8,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -45,8 +44,6 @@ public class Section {
 
     private Set<Entity> entities;
 
-    private Set<Entity> nerEntities;
-
     // This still contains linebreaks etc.
     private String text;
 
@@ -70,138 +67,81 @@ public class Section {
     private List<FileAttribute> fileAttributes = new ArrayList<>();
 
 
-    public void addAiEntities(String type, String asType) {
-
-        Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
-        Set<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toSet());
-        Set<Entity> found = EntitySearchUtils.find(searchText, values, asType, headline, sectionNumber, false, false, Engine.NER, true);
-        EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
-
-        Set<Entity> finalResult = new HashSet<>();
-
-        // Only keep Entities with correct offsets from AI Service.
-        for (Entity current : found) {
-            boolean foundSameOffsets = false;
-            for (Entity entity : entitiesOfType) {
-                if (entity.getStart().equals(current.getStart()) && entity.getEnd().equals(current.getEnd())) {
-                    foundSameOffsets = true;
-                    break;
-                }
-            }
-            if (foundSameOffsets) {
-                finalResult.add(current);
-            }
-        }
-
-        var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, finalResult);
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-        nerEntities.removeAll(entitiesOfType);
-    }
-
-
-    public void combineAiTypes(String startType, String combineTypes, int maxDistanceBetween, String asType, int minPartMatches, boolean allowDuplicateTypes) {
-
-        Set<String> combineSet = Set.of(combineTypes.split(","));
-
-        List<Entity> sorted = nerEntities.stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
-        Set<Entity> found = new HashSet<>();
-        int start = -1;
-        int lastEnd = -1;
-        int numberOfMatchParts = 0;
-        Set<String> foundParts = new HashSet<>();
-        for (Entity entity : sorted) {
-            if (entity.getType().equals(startType) && start == -1) {
-                lastEnd = entity.getEnd();
-                start = entity.getStart();
-                foundParts.add(entity.getType());
-                numberOfMatchParts++;
-            } else if (!allowDuplicateTypes && foundParts.contains(entity.getType())) {
-                if (numberOfMatchParts >= minPartMatches) {
-                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
-                }
-                start = -1;
-                lastEnd = -1;
-                numberOfMatchParts = 0;
-                foundParts = new HashSet<>();
-                if (entity.getType().equals(startType)) {
-                    lastEnd = entity.getEnd();
-                    start = entity.getStart();
-                    foundParts.add(entity.getType());
-                    numberOfMatchParts++;
-                }
-            } else if (entity.getType().equals(startType) && start != -1) {
-                if (numberOfMatchParts >= minPartMatches) {
-                    String value = searchText.substring(start, lastEnd);
-                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
-                }
-                start = entity.getStart();
-                lastEnd = entity.getEnd();
-                numberOfMatchParts = 0;
-                foundParts = new HashSet<>();
-                foundParts.add(entity.getType());
-                numberOfMatchParts++;
-            } else if (start != -1 && combineSet.contains(entity.getType()) && entity.getStart() - lastEnd < maxDistanceBetween) {
-                lastEnd = entity.getEnd();
-                numberOfMatchParts++;
-                foundParts.add(entity.getType());
-            }
-        }
-
-        if (numberOfMatchParts >= minPartMatches) {
-            String value = searchText.substring(start, lastEnd);
-            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
-        }
-
-        if (!found.isEmpty()) {
-            var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, found);
-            EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
-            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-        }
-    }
-
-
     @WhenCondition
-    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
-    }
-
-
-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
-    }
-
-
-    @WhenCondition
-    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
-    }
-
-
-    @WhenCondition
-    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
-
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
-    }
-
-
-    @WhenCondition
-    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
+                                           @Argument(ArgumentType.STRING) String value) {
 
         return fileAttributes != null && fileAttributes.stream()
-                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()));
+                .filter(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
     }
 
 
     @WhenCondition
-    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
+                                                    @Argument(ArgumentType.STRING) String value) {
 
-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
+                                              @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
+                                                     @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
+                                                              @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
+                                                        @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()))
+                .findFirst()
+                .isPresent();
+    }
+
+
+    @WhenCondition
+    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName,
+                             @Argument(ArgumentType.STRING) String value) {
+
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+
+        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
+                .toString()
+                .equals(value);
     }
 
 
@@ -213,13 +153,6 @@ public class Section {
     }
 
 
-    @WhenCondition
-    public boolean aiMatchesType(@Argument(ArgumentType.TYPE) String type) {
-
-        return nerEntities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
-    }
-
-
     @WhenCondition
     public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {
 
@@ -241,18 +174,10 @@ public class Section {
     }
 
 
-    @WhenCondition
-    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName, @Argument(ArgumentType.STRING) String value) {
-
-        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
-
-        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).toString().equals(value);
-    }
-
-
     @ThenAction
     public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group) {
 
         expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
     }
@@ -260,7 +185,8 @@ public class Section {
 
     @ThenAction
     public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group,
                               @Argument(ArgumentType.REGEX) String valuePattern) {
 
         Pattern compiledValuePattern = null;
@@ -291,7 +217,7 @@ public class Section {
                 String match = matcher.group(group);
 
                 if (StringUtils.isNotBlank(match)) {
-                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE);
+                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis());
                     expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
                 }
             }
@@ -303,184 +229,32 @@ public class Section {
 
 
     @ThenAction
-    public void redactImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+    public void redactImage(@Argument(ArgumentType.TYPE) String type,
+                            @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                            @Argument(ArgumentType.STRING) String reason,
                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
-        redactImage(type, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        redactImage(type, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
-                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redact(type, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        redact(type, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason,
-                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason) {
-
-        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, null, false);
-
-    }
-
-
-    @ThenAction
-    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                 @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                 @Argument(ArgumentType.STRING) String reason) {
-
-        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                 @Argument(ArgumentType.STRING) String reason) {
-
-        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                      @Argument(ArgumentType.STRING) String reason) {
-
-        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
-                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason,
-                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
-    }
-
-
-    @ThenAction
-    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
-    }
-
-
-    @ThenAction
-    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                          @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                          @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
-
-        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
-    }
-
-
-    @ThenAction
-    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                             @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
-    }
-
-
-    @ThenAction
-    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(text);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
-            }
-        }
-    }
-
-
-    @ThenAction
-    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
-
-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
-        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
-                entity.setRedaction(false);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setReferences(references);
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(true);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
+                image.setLegalBasis(legalBasis);
             }
         });
     }
 
 
     @ThenAction
-    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix, @Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                       @Argument(ArgumentType.STRING) String reason,
+                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
 
         entities.forEach(entity -> {
-            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                 entity.setRedaction(true);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -491,23 +265,71 @@ public class Section {
 
 
     @ThenAction
-    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                             @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactNotImage(@Argument(ArgumentType.TYPE) String type,
+                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                               @Argument(ArgumentType.STRING) String reason) {
 
-        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE);
-        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(false);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
+            }
+        });
     }
 
 
-    public void ignore(String type) {
+    @ThenAction
+    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                          @Argument(ArgumentType.STRING) String reason) {
 
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
+                entity.setRedaction(false);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+            }
+        });
+    }
+
+
+    public void ignore(String type){
         entities.removeIf(entity -> entity.getType().equals(type));
     }
 
 
     @ThenAction
-    public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.STRING) String pattern,
-                                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type,
+                                      @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                      @Argument(ArgumentType.STRING) String reason) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
+        Set<Entity> references = entities.stream()
+                .filter(entity -> entity.getType().equals(referenceType))
+                .collect(Collectors.toSet());
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
+                entity.setRedaction(false);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setReferences(references);
+            }
+        });
+    }
+
+
+    @ThenAction
+    public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type,
+                                              @Argument(ArgumentType.STRING) String pattern,
+                                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                              @Argument(ArgumentType.INTEGER) int group,
                                               @Argument(ArgumentType.TYPE) String asType) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
@@ -524,7 +346,7 @@ public class Section {
             while (matcher.find()) {
                 String match = matcher.group(group);
                 if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null, Engine.RULE));
+                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null));
                 }
             }
         }
@@ -535,8 +357,10 @@ public class Section {
 
 
     @ThenAction
-    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {
+    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group,
+                                         @Argument(ArgumentType.TYPE) String asType) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
 
@@ -545,7 +369,7 @@ public class Section {
         while (matcher.find()) {
             String match = matcher.group(group);
             if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE);
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null);
                 EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
             }
         }
@@ -553,15 +377,70 @@ public class Section {
 
 
     @ThenAction
-    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType) {
+    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix,
+                                   @Argument(ArgumentType.TYPE) String type,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.STRING) String reason,
+                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
-        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE);
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    @ThenAction
+    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value,
+                                  @Argument(ArgumentType.TYPE) String asType) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
         EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
     }
 
 
     @ThenAction
-    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType) {
+    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType,
+                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                             @Argument(ArgumentType.STRING) String reason,
+                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+    }
+
+
+    @ThenAction
+    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType,
+                                @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                @Argument(ArgumentType.STRING) String reason,
+                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        String[] values = StringUtils.substringsBetween(text, start, "\n");
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+    }
+
+
+    @ThenAction
+    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.TYPE) String asType) {
 
         String[] values = StringUtils.substringsBetween(text, start, "\n");
 
@@ -577,7 +456,8 @@ public class Section {
                 }
 
                 if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(cleanValue);
+                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>())
+                            .add(cleanValue);
                 }
             }
         }
@@ -585,34 +465,173 @@ public class Section {
 
 
     @ThenAction
-    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type) {
+    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.STRING) String reason,
+                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
-        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
     }
 
 
-    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis,
-                                           boolean redaction) {
+    @ThenAction
+    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group,
+                                         @Argument(ArgumentType.TYPE) String asType) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-        Matcher matcher = compiledPattern.matcher(searchText);
+
+        Matcher matcher = compiledPattern.matcher(text);
+
         while (matcher.find()) {
             String match = matcher.group(group);
             if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
                 localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
             }
         }
     }
 
 
-    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine) {
+    @ThenAction
+    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                          @Argument(ArgumentType.INTEGER) int group,
+                                          @Argument(ArgumentType.TYPE) String asType,
+                                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                          @Argument(ArgumentType.STRING) String reason,
+                                          @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
+            }
+        }
+    }
+
+
+    @ThenAction
+    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop,
+                              @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                              @Argument(ArgumentType.STRING) String reason,
+                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        String[] values = StringUtils.substringsBetween(searchText, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+    }
+
+
+    @ThenAction
+    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.STRING) String stop,
+                                   @Argument(ArgumentType.TYPE) String asType,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                   @Argument(ArgumentType.STRING) String reason,
+                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        String[] values = StringUtils.substringsBetween(text, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    String[] lines = value.split("\n");
+
+                    for (String line : lines) {
+
+                        if (line.trim().length() <= 2) {
+                            return;
+                        }
+
+                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @ThenAction
+    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.TYPE) String type) {
+
+        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
+    }
+
+
+    @ThenAction
+    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader,
+                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
+                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
+                           @Argument(ArgumentType.STRING) String reason,
+                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+    }
+
+
+    @ThenAction
+    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
+                              @Argument(ArgumentType.STRING) String reason) {
+
+        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
+    }
+
+
+    private Set<Entity> findEntities(@Argument(ArgumentType.STRING) String value,
+                                     @Argument(ArgumentType.TYPE) String asType,
+                                     @Argument(ArgumentType.BOOLEAN) boolean caseInsensitive,
+                                     @Argument(ArgumentType.BOOLEAN) boolean redacted,
+                                     @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                     @Argument(ArgumentType.STRING) String reason,
+                                     @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
 
         String text = caseInsensitive ? searchText.toLowerCase() : searchText;
         String searchValue = caseInsensitive ? value.toLowerCase() : value;
 
-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, engine, false);
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, Engine.RULE);
 
         found.forEach(entity -> {
             if (redacted) {
@@ -627,35 +646,8 @@ public class Section {
     }
 
 
-    private void redact(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
-
-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
-                entity.setRedaction(redaction);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private void redactImage(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
-
-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(redaction);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-                image.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, boolean addAsRecommendations, String reason, String legalBasis) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
+                              boolean addAsRecommendations, String reason, String legalBasis) {
 
         String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
 
@@ -692,92 +684,11 @@ public class Section {
                 while (matcher.find()) {
                     String match = matcher.group().trim();
                     if (match.length() >= 3) {
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(match);
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(match);
                         String lastname = match.split(" ")[0];
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(lastname);
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
-
-        String[] values = StringUtils.substringsBetween(text, start, "\n");
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis, boolean redaction) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
-
-        String[] values = StringUtils.substringsBetween(searchText, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-
-                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
-
-        String[] values = StringUtils.substringsBetween(text, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    String[] lines = value.split("\n");
-
-                    for (String line : lines) {
-
-                        if (line.trim().length() <= 2) {
-                            return;
-                        }
-
-                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
-                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                        if (redactEverywhere && !isLocal()) {
-                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
-                        }
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(lastname);
                     }
                 }
             }

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> imageMetadata = new ArrayList<>();
-
-}

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

@@ -1,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,55 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.*;
 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.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Text;
 import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Slf4j
 @Service
@@ -67,11 +42,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 +53,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);
@@ -97,24 +67,50 @@ public class AnalyzeService {
         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(), analyzeRequest.getAnalysisNumber(),
+                redactionLogEntries, legalBasis, dictionary.getVersion().getDossierTemplateVersion(), dictionary.getVersion().getDossierVersion(),
+                rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
     }
 
 
@@ -131,7 +127,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 +137,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 +150,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 +172,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 +203,10 @@ 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, analyzeRequest.getAnalysisNumber());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange
+                .getRedactionLog());
 
         long duration = System.currentTimeMillis() - startTime;
 
@@ -260,7 +223,6 @@ public class AnalyzeService {
                 .legalBasisVersion(redactionLog.getLegalBasisVersion())
                 .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
                 .wasReanalyzed(isReanalysis)
-                .manualRedactions(analyzeRequest.getManualRedactions())
                 .build();
     }
 
@@ -272,14 +234,13 @@ public class AnalyzeService {
         }
 
         return Stream.concat(manualRedactions.getLegalBasisChanges()
-                .stream()
-                .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
-                .stream()
-                .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
-                .stream()
-                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions()
-                .stream()
-                .map(ManualForceRedaction::getAnnotationId)))).collect(Collectors.toSet());
+                        .stream()
+                        .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
+                        .stream()
+                        .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
+                        .stream()
+                        .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();
@@ -62,7 +63,7 @@ public class DictionaryService {
             });
         });
 
-        if (dictionariesByDossier.containsKey(dossierId)) {
+        if(dictionariesByDossier.containsKey(dossierId)) {
             dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
             dictionaryModels.forEach(dictionaryModel -> {
                 dictionaryModel.getEntries().forEach(dictionaryEntry -> {
@@ -77,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();
@@ -87,26 +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<>();
-                            // add old entries from existing DictionaryModel
-                            oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries()));
-                            // Add Increments
-                            entries.addAll(convertEntries(t.getId(), currentVersion));
-
-                            return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                    .isHint(), t.isRecommendation(), entries, 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());
 
@@ -122,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);
@@ -135,9 +118,23 @@ public class DictionaryService {
     }
 
 
-    private Set<DictionaryEntry> convertEntries(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, true);
+                long externalVersion = dictionaryClient.getVersion(dossierTemplateId);
+                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
+                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
+                }
+            }
+        });
+    }
+
+
+    private Set<DictionaryEntry> convertEntries(String typeId) {
+
+        var type = dictionaryClient.getDictionaryForType(typeId);
 
         Set<DictionaryEntry> entries = new HashSet<>(type
                 .getEntries());
@@ -207,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));
@@ -236,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

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,20 +11,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.IdRemoval;
+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.Image;
@@ -60,7 +63,7 @@ public class EntityRedactionService {
             EntitySearchUtils.removeEntitiesContainedInLarger(entities);
         }
 
-        Map<Integer, List<Entity>> entitiesPerPage = convertToEntitiesPerPage(entities);
+        Map<Integer, List<Entity>> entitiesPerPage = convertToEnititesPerPage(entities);
         return new PageEntities(entitiesPerPage, imagesPerPage);
     }
 
@@ -73,14 +76,14 @@ 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) {
@@ -114,7 +117,7 @@ public class EntityRedactionService {
                     }
                 }
 
-                entities.getEntities().forEach(entity -> entity.getPositionSequences().forEach(ps -> {
+                entities.forEach(entity -> entity.getPositionSequences().forEach(ps -> {
                     if (idsToRemove.contains(ps.getId())) {
                         entity.setIgnored(true);
                     }
@@ -125,10 +128,9 @@ public class EntityRedactionService {
                     .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())
@@ -159,7 +161,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) {
@@ -221,60 +223,65 @@ public class EntityRedactionService {
     }
 
 
-    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.find(lowercaseInputString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY));
             } else {
                 EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
-                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
+                        .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.getResult().containsKey(sectionNumber)) {
+        if (redactionServiceSettings.isEnableEntityRecognition() && nerEntities.getResult()
+                .containsKey(sectionNumber)) {
             nerEntities.getResult().get(sectionNumber).forEach(res -> {
-                if (cellStarts == null || cellStarts.isEmpty()) {
-                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
+                if (cellstarts == null || cellstarts.isEmpty()) {
+                    nerValuesPerType.computeIfAbsent(RECOMMENDATION_PREFIX + 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));
+                        nerValuesPerType.computeIfAbsent(RECOMMENDATION_PREFIX + 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

@@ -7,11 +7,10 @@ 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.ManualRedactionEntry;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualResizeRedaction;
 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;
@@ -34,9 +33,8 @@ public class ManualRedactionSurroundingTextService {
     private final SurroundingWordsService surroundingWordsService;
 
 
-    public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
+    public ManualRedactions 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<>();
@@ -53,7 +51,8 @@ public class ManualRedactionSurroundingTextService {
                 while (addItty.hasNext()) {
                     var manualAddRedaction = addItty.next();
                     if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
+                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction
+                                .getPositions());
                         manualAddRedaction.setTextBefore(surroundingText.getLeft());
                         manualAddRedaction.setTextAfter(surroundingText.getRight());
                         processedAddRedactions.add(manualAddRedaction);
@@ -65,7 +64,8 @@ public class ManualRedactionSurroundingTextService {
                 while (resizeItty.hasNext()) {
                     var manualResizeRedaction = resizeItty.next();
                     if (sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
-                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction.getPositions());
+                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction
+                                .getPositions());
                         manualResizeRedaction.setTextBefore(surroundingText.getLeft());
                         manualResizeRedaction.setTextAfter(surroundingText.getRight());
                         processedResizeRedactions.add(manualResizeRedaction);
@@ -77,31 +77,27 @@ public class ManualRedactionSurroundingTextService {
 
         manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
         manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
-
-        return AnalyzeResult.builder()
-                .dossierId(dossierId)
-                .fileId(fileId)
-                .manualRedactions(manualRedactions)
-                .duration(System.currentTimeMillis() - startTime)
-                .build();
+        return manualRedactions;
     }
 
 
     private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
                                                      List<Rectangle> toFindPositions) {
 
-        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, false);
+        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText
+                .getSectionNumber(), false, false, Engine.DICTIONARY);
         Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
 
         Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
 
-        if (correctEntity == null) {
+        if(correctEntity == null){
             log.warn("Could not calculate surrounding text");
-            return Pair.of("", "");
+            return Pair.of("","");
         }
 
         if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
-            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText.getCellStarts());
+            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText
+                    .getCellStarts());
         } else {
             surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null);
         }

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

@@ -33,11 +33,17 @@ public class RedactionChangeLogService {
 
         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());
+                .filter(entry -> entry.getChanges().isEmpty() || !entry.getChanges()
+                        .get(entry.getChanges().size() - 1)
+                        .getType()
+                        .equals(ChangeType.REMOVED)).collect(Collectors.toSet());
 
         notRemovedPreviousEntries.forEach(added::remove);
 
@@ -81,7 +87,7 @@ public class RedactionChangeLogService {
 
         addedIds.forEach((k, v) -> {
             if (v.getChanges().isEmpty()) {
-                v.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+                v.getChanges().add(new Change(analysisNumber,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

@@ -70,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()
@@ -91,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:
@@ -172,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;
     }
 
 
@@ -186,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;
     }
 
 

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

@@ -1,9 +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.annotations.*;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -48,7 +46,7 @@ public class RedactionLogMergeService {
 
                 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);
                         }
                     });
@@ -119,9 +117,9 @@ 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 (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
@@ -134,65 +132,77 @@ public class RedactionLogMergeService {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
                 } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
+                    redactionLogEntry.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");
+                    log.info("Skipping merge for dictionary-modifying entry");
                 } else {
                     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.setHint(false);
+                        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 {
+                        redactionLogEntry.setStatus(AnnotationStatus.DECLINED);
                     }
 
                     redactionLogEntry.setReason(manualOverrideReason);
-
-                    redactionLogEntry.getManualChanges().add(ManualChange.from(manualRemoval)
-                            .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ?
-                                    ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+                    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 = dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId);
                 if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
                     // Forcing a skipped hint should result in a hint
-                    if (dictionaryIsHint) {
+                    if (dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId)) {
                         redactionLogEntry.setHint(true);
                     } else {
                         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"));
+                    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);
 
             }
 
@@ -200,9 +210,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());
                     }
@@ -211,45 +223,47 @@ public class RedactionLogMergeService {
                     }
                 } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
+                    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.setStatus(AnnotationStatus.APPROVED);
                     redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
                     redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
                     redactionLogEntry.setValue(manualResizeRedact.getValue());
+                    redactionLogEntry.setHasBeenResized(true);
                     redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
                     redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
                 } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
                     manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
+                    redactionLogEntry.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);
+
             }
 
         });
@@ -305,22 +319,14 @@ public class RedactionLogMergeService {
 
     private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
 
-        return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) &&
-                manualRedactionEntry.getProcessedDate() != null &&
-                (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+        return manualRedactionEntry.getStatus()
+                .equals(AnnotationStatus.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
     }
 
 
     private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
                                                       String dossierTemplateId) {
 
-        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);
-
         return RedactionLogEntry.builder()
                 .id(id)
                 .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
@@ -334,8 +340,11 @@ 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();
     }
 

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/utils/EntitySearchUtils.java

@@ -55,7 +55,7 @@ public class EntitySearchUtils {
 
 
     public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
-                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine, boolean ignoreMinLength) {
+                            boolean isDictionaryEntry, boolean isDossierDictionary, Engine engine) {
 
         Set<Entity> found = new HashSet<>();
 
@@ -63,7 +63,7 @@ public class EntitySearchUtils {
 
             String cleanValue = value.trim();
 
-            if (!ignoreMinLength && cleanValue.length() <= 2) {
+            if (cleanValue.length() <= 2) {
                 continue;
             }
 

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,61 +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.getImageMetadata().stream().forEach(imageMetadata -> {
-            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)) : ImageType.OTHER;
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), classification, imageMetadata.getPosition().getPageNumber()));
-        });
-
-        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/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,6 +17,6 @@ public class RedactionServiceSettings {
 
     private int analysisVersion = 1;
 
-    private boolean nerServiceEnabled = true;
+    private boolean enableEntityRecognition = true;
 
 }

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

@@ -8,7 +8,6 @@ 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;
@@ -45,24 +44,6 @@ public class RedactionStorageService {
     }
 
 
-    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,13 +86,14 @@ 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);
         }
     }
 

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,13 @@ 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 +68,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.getImageMetadata().stream().forEach(imageMetadata -> {
-            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber() ,x -> new ArrayList<>())
-                    .add(new PdfImage(new RedRectangle2D(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1(), imageMetadata.getGeometry().getWidth(), imageMetadata.getGeometry().getHeight()), ImageType.valueOf(imageMetadata.getClassification().getLabel().toUpperCase(Locale.ROOT)), imageMetadata.getPosition().getPageNumber()));
-        });
+        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 +112,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 +133,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 +171,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 +209,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())

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,4 @@ 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
+Test Ignored Hint CBI_ADDRESS

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/drools/rules.drl

@@ -15,21 +15,6 @@ global Section section
 //        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", "recommendation_CBI_author");
-    end
-
-rule "0: Combine ai types CBI_author from ai"
-    when
-        Section(aiMatchesType("ORG"))
-    then
-        section.combineAiTypes("ORG", "STREET,POSTAL,COUNTRY,CARDINAL,CITY,STATE", 20, "recommendation_CBI_address", 3, false);
-    end
-
 rule "0: Expand CBI Authors with firstname initials"
     when
         Section(matchesType("CBI_author") || matchesType("recommendation_CBI_author"))

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",
-  "imageMetadata": [
-    {
-      "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"
-      }
-    ]
-  }
-}