Added equalsIgnoreCase fileattributes methods for rules

Pull request #213 : RED-1755: Calculate falgs in file-management-service async
Merge in RED/redaction-service from RED-1755-2 to release/2.52.x * commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15': RED-1755: Calculate falgs in file-management-service async
2021-08-20 14:51:22 +02:00 · 2021-08-18 11:58:28 +02:00 · 2021-08-18 10:02:37 +02:00 · 2021-08-17 12:21:59 +02:00 · 2021-08-17 11:28:52 +02:00 · 2021-08-13 13:56:23 +02:00
27 changed files with 669 additions and 794 deletions
@@ -7,9 +7,8 @@ import lombok.NoArgsConstructor;

 import java.time.OffsetDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;

@Data
@@ -24,7 +23,11 @@ public class AnalyzeRequest {
    private boolean reanalyseOnlyIfPossible;
    private ManualRedactions manualRedactions;
    private OffsetDateTime lastProcessed;
-    private Set<Integer> excludedPages;
+
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();

    @Builder.Default
    private List<FileAttribute> fileAttributes = new ArrayList<>();
@@ -15,10 +15,6 @@ public class AnalyzeResult {
    private String fileId;
    private long duration;
    private int numberOfPages;
-    private boolean hasHints;
-    private boolean hasRequests;
-    private boolean hasRedactions;
-    private boolean hasImages;
    private boolean hasUpdates;
    private long dictionaryVersion;
    private long dossierDictionaryVersion;
@@ -27,6 +23,8 @@ public class AnalyzeResult {

    private boolean wasReanalyzed;

+    private int analysisVersion;
+

 }

@@ -23,11 +23,8 @@ public class ManualRedactionEntry {
    private String legalBasis;
    private List<Rectangle> positions = new ArrayList<>();
    private Status status;
+
    private boolean addToDictionary;
-
-    private String section;
-    private int sectionNumber;
-
    private boolean addToDossierDictionary;

    private OffsetDateTime requestDate;
@@ -10,6 +10,13 @@ import java.util.List;
@AllArgsConstructor
 public class RedactionLog {

+
+    /**
+     * Version 0 Redaction Logs have manual redactions merged inside them
+     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
+     */
+    private long analysisVersion;
+
    private List<RedactionLogEntry> redactionLogEntry;
    private List<LegalBasisMapping> legalBasis;

@@ -9,6 +9,8 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;

+
+
@Data
@Builder
@NoArgsConstructor
@@ -34,6 +36,7 @@ public class RedactionLogEntry {
    private boolean manual;
    private Status status;
    private ManualRedactionType manualRedactionType;
+    private String manualRedactionUserId;
    private boolean isDictionaryEntry;

    private String textBefore;
@@ -46,6 +49,7 @@ public class RedactionLogEntry {
    private int endOffset;

    private boolean isImage;
+    private boolean imageHasTransparency;

    private boolean isDossierDictionaryEntry;

@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.HashSet;
+import java.util.Set;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,4 +18,6 @@ public class RedactionRequest {
    private String fileId;
    private String dossierTemplateId;
    private ManualRedactions manualRedactions;
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
 }
@@ -30,4 +30,5 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
+
 }
@@ -8,10 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;

 public interface RedactionResource {

-    String RULE_SET_PARAMETER_NAME = "dossierTemplateId";
-    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
-
-
    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

@@ -24,13 +20,10 @@ public interface RedactionResource {
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

-    @PostMapping(value = "/rules/update" + RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId);
-
    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
    void testRules(@RequestBody String rules);

    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getRedactionLogPreview(@RequestBody RedactionRequest redactionRequest);
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);

 }
@@ -1,11 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -13,8 +9,9 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -41,7 +38,7 @@ public class RedactionController implements RedactionResource {
    private final AnnotationService annotationService;
    private final PdfSegmentationService pdfSegmentationService;
    private final RedactionStorageService redactionStorageService;
-    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final RedactionLogMergeService redactionLogMergeService;

    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

@@ -143,14 +140,6 @@ public class RedactionController implements RedactionResource {

    }

-
-    @Override
-    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId) {
-
-        droolsExecutionService.updateRules(dossierTemplateId);
-    }
-
-
    @Override
    public void testRules(@RequestBody String rules) {

@@ -158,15 +147,21 @@ public class RedactionController implements RedactionResource {
    }

    @Override
-    public RedactionLog getRedactionLogPreview(RedactionRequest redactionRequest) {
+    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {

        log.info("Requested preview for: {}", redactionRequest);
        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());

        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
-        return redactionLogCreatorService.getRedactionLogPreview(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions());
-    }

+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        if (redactionLog.getAnalysisVersion() == 0) {
+            // old redaction logs are returned directly
+            return redactionLog;
+        } else {
+            return redactionLogMergeService.mergeRedactionLogData(redactionLog, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
+        }
+    }

    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {

@@ -190,7 +190,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
                PDImageXObject image = (PDImageXObject)xobject;
-
                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();

                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());
@@ -199,7 +198,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage().getColorModel().hasAlpha()));
                }
            }
        } catch (Exception e) {
@@ -20,5 +20,6 @@ public class Image implements ReasonHolder {
    private int sectionNumber;
    private String section;
    private int page;
+    private boolean hasTransparency;

 }
@@ -18,14 +18,16 @@ public class PdfImage {
    private RedRectangle2D position;
    private ImageType imageType;
    private boolean isAppendedToParagraph;
+    private boolean hasTransparency;

    @NonNull
    private int page;

-    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
+    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
        this.image = image;
        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
        this.page = page;
+        this.hasTransparency = hasTransparency;
    }

 }
@@ -72,6 +72,19 @@ public class Section {
    }


+    public boolean fileAttributeByIdEqualsIgnoreCase(String id, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(String placeholder, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByLabelEqualsIgnoreCase(String label, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+
    public boolean rowEquals(String headerName, String value) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
@@ -5,35 +5,20 @@ import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
 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.server.settings.RedactionServiceSettings;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

@Service
+@RequiredArgsConstructor
 public class AnalyzeResponseService {

+    private final RedactionServiceSettings redactionServiceSettings;
+
    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
                                               RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {

-        boolean hasHints = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));
-
-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
-
-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
-
-        boolean hasImages = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image") || entry.isImage());

        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
                .getRedactionLogEntry()
@@ -46,11 +31,8 @@ public class AnalyzeResponseService {
                .fileId(fileId)
                .duration(duration)
                .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
                .hasUpdates(hasUpdates)
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                .rulesVersion(redactionLog.getRulesVersion())
                .dictionaryVersion(redactionLog.getDictionaryVersion())
                .legalBasisVersion(redactionLog.getLegalBasisVersion())
@@ -212,13 +212,13 @@ public class DictionaryService {
            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
        }

-        return new Dictionary(copy, DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
    }


    public float[] getRequestRemoveColor(String dossierTemplateId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
    }


@@ -63,7 +63,7 @@ public class DroolsExecutionService {
            rulesVersion = -1L;
        }

-        if (version > rulesVersion.longValue()) {
+        if (version > rulesVersion) {
            rulesVersionPerDossierTemplateId.put(dossierTemplateId, version);
            return createOrUpdateKieContainer(dossierTemplateId);
        }
@@ -128,7 +128,7 @@ public class DroolsExecutionService {
        if (rulesVersion == null) {
            return -1;
        }
-        return rulesVersion.longValue();
+        return rulesVersion;
    }

 }
@@ -1,13 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.FileAttribute;
-import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
@@ -15,10 +8,8 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUti
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
@@ -52,35 +43,13 @@ public class EntityRedactionService {

        if (dictionary.hasLocalEntries()) {

-            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
-            documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
-                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
-                            .add(entity);
-                }
-            });
-
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(documentEntities, dictionary);
            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber, fileAttributes);
            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

-        for (Entity entity : documentEntities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
-                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
+        classifiedDoc.setEntities(convertToEnititesPerPage(documentEntities));

        dictionaryService.updateExternalDictionary(dictionary, dossierTemplateId);

@@ -89,6 +58,39 @@ public class EntityRedactionService {
    }


+    public Map<Integer, List<Entity>> convertToEnititesPerPage(Set<Entity> entities){
+        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+        for (Entity entity : entities) {
+            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                        .add(entityPositionSequence);
+            }
+
+            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                entitiesPerPage
+                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
+            }
+        }
+        return entitiesPerPage;
+    }
+
+
+    public Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary){
+        Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+        entities.stream().forEach(entity -> {
+            if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                        .add(entity);
+            }
+        });
+        return hintsPerSectionNumber;
+    }
+
    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
@@ -103,9 +105,9 @@ public class EntityRedactionService {
            List<Table> tables = paragraph.getTables();
            for (Table table : tables) {
                if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, sectionNumber, dictionary, local, hintsPerSectionNumber, fileAttributes));
                }
                sectionNumber.incrementAndGet();
            }
@@ -132,44 +134,47 @@ public class EntityRedactionService {
        }

        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            documentEntities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedSection.getEntities());

-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
            }

-            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-                if (dictionary.isRecommendation(key)) {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                        if (!dictionary.containsValue(key, value)) {
-                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                        }
-                    });
-                } else {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-
-                        if (dictionary.getLocalAccessMap().get(key) == null) {
-                            log.warn("Dictionary {} is null", key);
-                        }
-
-                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                            log.warn("Dictionary {} localEntries is null", key);
-                        }
-
-                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    });
-                }
-            });
-
+            addLocalValuesToDictionary(analysedSection, dictionary);
        });

        return documentEntities;
    }


+    public void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary){
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+            if (dictionary.isRecommendation(key)) {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    if (!dictionary.containsValue(key, value)) {
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    }
+                });
+            } else {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                    if (dictionary.getLocalAccessMap().get(key) == null) {
+                        log.warn("Dictionary {} is null", key);
+                    }
+
+                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                        log.warn("Dictionary {} localEntries is null", key);
+                    }
+
+                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                });
+            }
+        });
+    }
+
+
    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
-                                                               ManualRedactions manualRedactions,
                                                               AtomicInteger sectionNumber, Dictionary dictionary,
                                                               boolean local,
                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber,
@@ -198,7 +203,6 @@ public class EntityRedactionService {
                sectionText.getSectionAreas().add(sectionArea);
                sectionText.getTextBlocks().addAll(cell.getTextBlocks());

-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
                int cellStart = start;

                if (!cell.isHeaderCell()) {
@@ -259,7 +263,6 @@ public class EntityRedactionService {


    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
-                                                                  ManualRedactions manualRedactions,
                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
                                                                  boolean local,
                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
@@ -288,7 +291,6 @@ public class EntityRedactionService {
                for (TextBlock textBlock : cell.getTextBlocks()) {
                    entireTableText.addAll(textBlock.getSequences());
                }
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
            }
        }

@@ -348,7 +350,6 @@ public class EntityRedactionService {
            classifiedDoc.getSectionText().add(sectionText);
        }

-        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
        Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);

@@ -396,26 +397,6 @@ public class EntityRedactionService {
    }


-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
-                                              String section, int sectionNumber) {
-
-        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
-            return;
-        }
-
-        for (TextBlock textBlock : textBlocks) {
-            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
-                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                    if (textBlock.contains(rectangle)) {
-                        manualRedactionEntry.setSection(section);
-                        manualRedactionEntry.setSectionNumber(sectionNumber);
-                    }
-                }
-            }
-        }
-    }
-
-
    private Image convertAndRecategorize(PdfImage pdfImage, int sectionNumber, String headline, ManualRedactions manualRedactions) {

        Image image = Image.builder()
@@ -426,6 +407,7 @@ public class EntityRedactionService {
                .sectionNumber(sectionNumber)
                .section(headline)
                .page(pdfImage.getPage())
+                .hasTransparency(pdfImage.isHasTransparency())
                .build();

        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
@@ -1,56 +1,32 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.iqser.red.service.file.management.v1.api.model.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.Comment;
-import com.iqser.red.service.redaction.v1.model.IdRemoval;
-import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
-import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
-import com.iqser.red.service.redaction.v1.model.ManualLegalBasisChange;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-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.Status;
+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.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.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 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
@RequiredArgsConstructor
@@ -66,6 +42,7 @@ public class ReanalyzeService {
    private final RedactionChangeLogService redactionChangeLogService;
    private final AnalyzeResponseService analyzeResponseService;
    private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;


    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
@@ -87,13 +64,12 @@ public class ReanalyzeService {

        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
                .getDossierId(), analyzeRequest.getFileAttributes());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierTemplateId());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getDossierTemplateId());

        log.info("Redaction analysis successful...");

        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), classifiedDoc.getRedactionLogEntities(), legalBasis, classifiedDoc.getDictionaryVersion()
                .getDossierTemplateVersion(), classifiedDoc.getDictionaryVersion()
                .getDossierVersion(), classifiedDoc.getRulesVersion(), legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));

@@ -132,20 +108,66 @@ public class ReanalyzeService {
        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());

-        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
-        Map<String, List<Comment>> comments = null;
-        Set<ManualRedactionEntry> manualAdds = null;
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse().isEmpty() ? analyzeRequest.getSectionsToReanalyse() :
+                findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);

-        if (analyzeRequest.getManualRedactions() != null) {
-            // TODO comments will be removed from redactionLog, so we ignore this first.
-            comments = analyzeRequest.getManualRedactions().getComments();
-            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
+        if (sectionsToReanalyse.isEmpty()) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
        }

+        List<SectionText> reanalysisSections = text.getSectionTexts()
+                .stream()
+                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
+                .collect(Collectors.toList());
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
+                .getDossierId());
+
+        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+        Set<Entity> entities = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage);
+
+        if (dictionary.hasLocalEntries()) {
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = entityRedactionService.getHintsPerSection(entities, dictionary);
+            Set<Entity> foundByLocal = findEntities(reanalysisSections, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        }
+
+        Map<Integer, List<Entity>> entitiesPerPage = entityRedactionService.convertToEnititesPerPage(entities);
+
+        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+        for (int page = 1; page <= text.getNumberOfPages(); page++) {
+            if (entitiesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+            if (imagesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, page, analyzeRequest
+                        .getDossierTemplateId()));
+            }
+
+        }
+
+        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
+        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        analyzeResult.setWasReanalyzed(true);
+        return analyzeResult;
+    }
+
+
+    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
+                                                 Text text, AnalyzeRequest analyzeRequest) {
+
+        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
+
        Set<Integer> sectionsToReanalyse = new HashSet<>();
        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+            if (entry.isManual() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
                sectionsToReanalyse.add(entry.getSectionNumber());
            }
            if (entry.isImage() || entry.getType().equals("image")) {
@@ -159,47 +181,24 @@ public class ReanalyzeService {
                sectionsToReanalyse.add(sectionText.getSectionNumber());
            }

-            if (manualAdds != null) {
-                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-                    for (ManualRedactionEntry manualAdd : manualAdds) {
-                        for (Rectangle manualPosition : manualAdd.getPositions()) {
-                            if (sectionArea.contains(manualPosition)) {
-                                manualAdd.setSection(sectionText.getHeadline());
-                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
-                            }
-                        }
-                    }
-                }
-            }
        }

        log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);

-        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        }
+        return sectionsToReanalyse;
+    }

-        List<SectionText> reanalysisSections = new ArrayList<>();

-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (sectionsToReanalyse.contains(sectionText.getSectionNumber())) {
-                reanalysisSections.add(sectionText);
-            }
-        }
-
-        //--
-
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest
-                .getDossierId());
+    private Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
+                                     KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                     Map<Integer, Set<Image>> imagesPerPage) {

        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (SectionText reanalysisSection : reanalysisSections) {

            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
-                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, local);
            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
                        .getCellStarts());
@@ -207,14 +206,15 @@ public class ReanalyzeService {
                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
            }

-            if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+            if (!local && reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                    .isEmpty() && analyzeRequest.getManualRedactions() != null && analyzeRequest.getManualRedactions()
                    .getImageRecategorizations() != null) {
                for (Image image : reanalysisSection.getImages()) {
                    String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
-                    for(ManualImageRecategorization imageRecategorization: analyzeRequest.getManualRedactions()
-                            .getImageRecategorizations()){
-                        if(imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId().equals(imageId)){
+                    for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
+                            .getImageRecategorizations()) {
+                        if (imageRecategorization.getStatus().equals(Status.APPROVED) && imageRecategorization.getId()
+                                .equals(imageId)) {
                            image.setType(imageRecategorization.getType());
                        }
                    }
@@ -224,7 +224,10 @@ public class ReanalyzeService {
            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(false)
                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(entities)
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities)
                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                    .searchText(reanalysisSection.getSearchableText().toString())
                    .headline(reanalysisSection.getHeadline())
@@ -238,56 +241,19 @@ public class ReanalyzeService {
        }

        Set<Entity> entities = new HashSet<>();
-        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            entities.addAll(analysedRowSection.getEntities());
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            entities.addAll(analysedSection.getEntities());
            EntitySearchUtils.removeEntitiesContainedInLarger(entities);

-            for (Image image : analysedRowSection.getImages()) {
+            for (Image image : analysedSection.getImages()) {
                imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
            }

+            entityRedactionService.addLocalValuesToDictionary(analysedSection, dictionary);
        });

-        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-        for (Entity entity : entities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
-
-        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
-        for (int page = 1; page <= text.getNumberOfPages(); page++) {
-            if (entitiesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, analyzeRequest
-                    .getDossierTemplateId()));
-        }
-
-        redactionLog.getRedactionLogEntry().removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        AnalyzeResult analyzeResult = finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        analyzeResult.setWasReanalyzed(true);
-        return analyzeResult;
+        return entities;
    }


@@ -310,7 +276,7 @@ public class ReanalyzeService {
    }


-    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
+    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {

        if (manualRedactions == null) {
            return new HashSet<>();
@@ -338,21 +304,18 @@ public class ReanalyzeService {
                .sectionNumber(entry.getSectionNumber())
                .section(entry.getSection())
                .page(position.getPage())
+                .hasTransparency(entry.isImageHasTransparency())
                .build();
    }


    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {

-        redactionLog.getRedactionLogEntry().forEach(entry -> {
-            entry.getPositions().forEach(pos -> {
-                if (excludedPages != null && excludedPages.contains(pos.getPage())) {
-                    entry.setExcluded(true);
-                } else {
-                    entry.setExcluded(false);
-                }
-            });
-        });
+        if(excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> { if (excludedPages.contains(pos.getPage())) {
+                entry.setExcluded(true);
+            }}));
+        }
    }

 }
@@ -1,6 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -9,17 +13,19 @@ import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSeque
 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;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ReasonHolder;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 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.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;

@Service
@@ -29,10 +35,7 @@ public class RedactionLogCreatorService {
    private final DictionaryService dictionaryService;


-    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
-                                   String dossierTemplateId) {
-
-        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, String dossierTemplateId) {

        for (int page = 1; page <= numberOfPages; page++) {

@@ -40,24 +43,18 @@ public class RedactionLogCreatorService {

            if (classifiedDoc.getEntities().get(page) != null) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, dossierTemplateId));
-            }
-
-            if (manualRedactionPages.contains(page)) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId));
+                        .addAll(addEntries(classifiedDoc.getEntities(), page, dossierTemplateId));
            }

            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, dossierTemplateId));
+                        .addAll(addImageEntries(classifiedDoc.getImages(), page, dossierTemplateId));
            }
        }
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
-                                                   int pageNumber, String dossierTemplateId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

@@ -67,7 +64,7 @@ public class RedactionLogCreatorService {

            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                    .id(id)
-                    .color(getColorForImage(image.getType(), dossierTemplateId, false, image.isRedaction()))
+                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
                    .isImage(true)
                    .type(image.getType())
                    .redacted(image.isRedaction())
@@ -83,9 +80,9 @@ public class RedactionLogCreatorService {
                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
                    .sectionNumber(image.getSectionNumber())
                    .section(image.getSection())
+                    .imageHasTransparency(image.isHasTransparency())
                    .build();

-            processImageEntry(manualRedactions, dossierTemplateId, image, redactionLogEntry);

            redactionLogEntities.add(redactionLogEntry);
        }
@@ -93,135 +90,8 @@ public class RedactionLogCreatorService {
        return redactionLogEntities;
    }

-    private void processImageEntry(ManualRedactions manualRedactions, String dossierTemplateId, ReasonHolder image, RedactionLogEntry redactionLogEntry) {
-        if (manualRedactions != null && !manualRedactions.getImageRecategorizations().isEmpty()) {
-            for (ManualImageRecategorization recategorization : manualRedactions.getImageRecategorizations()) {
-                if (recategorization.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (recategorization.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setType(recategorization.getType());
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", recategorized by manual override");
-                    } else if (recategorization.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to recategorize");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setRecategorizationType(recategorization.getType());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }

-                    image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-            for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                if (manualRemoval.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                        image.setRedaction(false);
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                    redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-            for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                if (manualForceRedact.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        image.setRedaction(true);
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                }
-            }
-        }
-
-
-        if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
-            for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
-                if (manualLegalBasisChange.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(image.getRedactionReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColorForImage(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-                }
-            }
-        }
-    }
-
-
-    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
-
-        Set<Integer> manualRedactionPages = new HashSet<>();
-
-        if (manualRedactions == null) {
-            return manualRedactionPages;
-        }
-
-        manualRedactions.getEntriesToAdd().forEach(entry -> {
-            entry.getPositions().forEach(pos -> {
-                manualRedactionPages.add(pos.getPage());
-            });
-        });
-        return manualRedactionPages;
-    }
-
-
-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
-                                              int page, String dossierTemplateId) {
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

@@ -244,7 +114,6 @@ public class RedactionLogCreatorService {
                }

                redactionLogEntry.setId(entityPositionSequence.getId());
-                processRedactionLogEntry(manualRedactions, dossierTemplateId, redactionLogEntry, entity);

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -268,112 +137,6 @@ public class RedactionLogCreatorService {
        return redactionLogEntities;
    }

-    private void processRedactionLogEntry(ManualRedactions manualRedactions, String dossierTemplateId, RedactionLogEntry redactionLogEntry, ReasonHolder reasonHolder) {
-
-        List<Comment> comments = null;
-
-        if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-            for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                if (manualRemoval.getId().equals(redactionLogEntry.getId())) {
-                    comments = manualRedactions.getComments().get(manualRemoval.getId());
-                    String manualOverrideReason = null;
-                    if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                        reasonHolder.setRedaction(false);
-                        redactionLogEntry.setRedacted(false);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", removed by manual override");
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                    } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", requested to remove");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                    redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-            for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                if (manualForceRedact.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                        reasonHolder.setRedaction(true);
-                        redactionLogEntry.setRedacted(true);
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted()));
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", forced by manual override");
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", requested to force redact");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-
-                }
-            }
-        }
-
-        if (manualRedactions != null && !manualRedactions.getManualLegalBasisChanges().isEmpty()) {
-            for (ManualLegalBasisChange manualLegalBasisChange : manualRedactions.getManualLegalBasisChanges()) {
-                if (manualLegalBasisChange.getId().equals(redactionLogEntry.getId())) {
-                    String manualOverrideReason = null;
-                    if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
-                        redactionLogEntry.setStatus(Status.APPROVED);
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", legal basis was manually changed");
-                        redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
-                    } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
-                        manualOverrideReason = mergeReasonIfNecessary(reasonHolder.getRedactionReason(), ", legal basis change requested");
-                        redactionLogEntry.setStatus(Status.REQUESTED);
-                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted()));
-                        redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
-                    } else {
-                        redactionLogEntry.setStatus(Status.DECLINED);
-                    }
-
-                    reasonHolder.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : reasonHolder.getRedactionReason());
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
-                    redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
-                }
-            }
-        }
-
-
-        if (manualRedactions != null) {
-            comments = manualRedactions.getComments().get(redactionLogEntry.getId());
-        }
-
-        redactionLogEntry.setComments(comments);
-    }
-
-    private String mergeReasonIfNecessary(String currentReason, String addition) {
-        if (currentReason != null) {
-            if (!currentReason.contains(addition)) {
-                return currentReason + addition;
-            }
-            return currentReason;
-        } else {
-            return "";
-        }
-    }
-

    private List<Rectangle> getRectanglesPerLine(List<RedTextPosition> textPositions, int page) {

@@ -402,73 +165,10 @@ public class RedactionLogCreatorService {
    }


-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, int page,
-                                                       String dossierTemplateId) {
-
-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        if (manualAdds == null) {
-            return redactionLogEntities;
-        }
-
-        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
-
-            String id = manualRedactionEntry.getId();
-
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, dossierTemplateId);
-
-            List<Rectangle> rectanglesOnPage = new ArrayList<>();
-            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                if (page == rectangle.getPage()) {
-                    rectanglesOnPage.add(rectangle);
-                    redactionLogEntry.getPositions().add(rectangle);
-                }
-            }
-
-            redactionLogEntry.setComments(comments.get(id));
-            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                redactionLogEntities.add(redactionLogEntry);
-            }
-        }
-
-        return redactionLogEntities;
-    }
-
-
-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
-
-        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
-    }
-
-
-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String dossierTemplateId) {
-
-        return RedactionLogEntry.builder()
-                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
-                .reason(manualRedactionEntry.getReason())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .value(manualRedactionEntry.getValue())
-                .type(manualRedactionEntry.getType())
-                .redacted(true)
-                .isHint(false)
-                .section(manualRedactionEntry.getSection())
-                .sectionNumber(manualRedactionEntry.getSectionNumber())
-                .manual(true)
-                .status(manualRedactionEntry.getStatus())
-                .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .build();
-    }
-
-
    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

        return RedactionLogEntry.builder()
-                .color(getColor(entity.getType(), dossierTemplateId, false, entity.isRedaction()))
+                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
@@ -489,59 +189,6 @@ public class RedactionLogCreatorService {
    }


-    private float[] getColor(String type, String dossierTemplateId, boolean requestedToRemove, boolean isRedaction) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!isRedaction && !isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
-
-        if (status.equals(Status.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(dossierTemplateId);
-        } else if (status.equals(Status.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId) {
-
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColorForImage(String type, String dossierTemplateId, boolean requestedToRemove, boolean isRedaction) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(type, dossierTemplateId);
-    }
-
-
-    private boolean isHint(String type, String dossierTemplateId) {
-
-        return dictionaryService.isHint(type, dossierTemplateId);
-    }
-
-
-    private boolean isRecommendation(String type, String dossierTemplateId) {
-
-        return dictionaryService.isRecommendation(type, dossierTemplateId);
-    }
-
-
    private void addSectionGrid(Document classifiedDoc, int page) {

        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
@@ -585,104 +232,26 @@ public class RedactionLogCreatorService {
        }
    }

-    public RedactionLog getRedactionLogPreview(RedactionLog redactionLog, String dossierTemplateId, ManualRedactions manualRedactions) {

+    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {

-        var manualRedactionPages = getManualRedactionPages(manualRedactions);
-
-        // generate all manual entries
-        var manualRedactionLogEntries = new HashMap<String, RedactionLogEntry>();
-        for (var page : manualRedactionPages) {
-
-            var pageEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId);
-
-            for (var entry : pageEntries) {
-                manualRedactionLogEntries.put(entry.getId(), entry);
-            }
+        if (!isRedaction && !isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
        }
-
-        for (var manualEntry : manualRedactionLogEntries.values()) {
-            var existingEntry = redactionLog.getRedactionLogEntry().stream().filter(e -> e.getId().equals(manualEntry.getId())).findAny();
-            if (existingEntry.isPresent()) {
-                // if it has already been processed of sorts, update it
-                BeanUtils.copyProperties(manualEntry, existingEntry.get());
-            } else {
-                // not yet in the redaction-log - add it
-                redactionLog.getRedactionLogEntry().add(manualEntry);
-            }
-        }
-
-
-        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-
-            var reasonHolder = new PreviewReasonHolder(entry);
-
-            if (entry.isImage()) {
-                processImageEntry(manualRedactions, dossierTemplateId, reasonHolder, entry);
-            }
-
-            processRedactionLogEntry(manualRedactions, dossierTemplateId, entry, reasonHolder);
-        }
-
-
-        handleAddToDictionary(redactionLog, manualRedactions, dossierTemplateId);
-
-        return redactionLog;
+        return dictionaryService.getColor(type, dossierTemplateId);
    }


-    private void handleAddToDictionary(RedactionLog redactionLog, ManualRedactions manualRedactions, String dossierTemplateId) {
+    private boolean isHint(String type, String dossierTemplateId) {

-        for (var manualRedaction : manualRedactions.getEntriesToAdd()) {
-
-            // not yet processed, and dictionary modifying, show in redaction-log preview
-            if (manualRedaction.getProcessedDate() == null && manualRedaction.isAddToDictionary() || manualRedaction.isAddToDossierDictionary()) {
-                var redactionLogEntry = createRedactionLogEntry(manualRedaction, manualRedaction.getId(), dossierTemplateId);
-                redactionLogEntry.setDictionaryEntry(manualRedaction.isAddToDictionary());
-                redactionLogEntry.setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
-                redactionLogEntry.setPositions(manualRedaction.getPositions());
-
-
-                var found = redactionLog.getRedactionLogEntry().stream().filter(r -> r.getId().equalsIgnoreCase(redactionLogEntry.getId())).findAny();
-                if (found.isPresent()) {
-                    found.get().setDictionaryEntry(manualRedaction.isAddToDictionary());
-                    found.get().setDossierDictionaryEntry(manualRedaction.isAddToDossierDictionary());
-                    found.get().setPositions(manualRedaction.getPositions());
-                } else {
-                    redactionLog.getRedactionLogEntry().add(redactionLogEntry);
-                }
-
-
-            }
-        }
+        return dictionaryService.isHint(type, dossierTemplateId);
    }

-    public static class PreviewReasonHolder implements ReasonHolder {

-        private final RedactionLogEntry entry;
+    private boolean isRecommendation(String type, String dossierTemplateId) {

-        public PreviewReasonHolder(RedactionLogEntry entry) {
-            this.entry = entry;
-        }
-
-        @Override
-        public String getRedactionReason() {
-            return entry.getReason();
-        }
-
-        @Override
-        public void setRedactionReason(String reason) {
-            entry.setReason(reason);
-        }
-
-        @Override
-        public boolean isRedaction() {
-            return entry.isRedacted();
-        }
-
-        @Override
-        public void setRedaction(boolean value) {
-            entry.setRedacted(value);
-        }
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
    }
+
+
 }
@@ -0,0 +1,328 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
+import com.iqser.red.service.redaction.v1.model.ManualImageRecategorization;
+import com.iqser.red.service.redaction.v1.model.ManualLegalBasisChange;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+import com.iqser.red.service.redaction.v1.model.ManualRedactions;
+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.Status;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionLogMergeService {
+
+    private final DictionaryService dictionaryService;
+
+
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, String dossierTemplateId,
+                                              ManualRedactions manualRedactions, Set<Integer> excludedPages) {
+
+        log.info("Merging Redaction log with manual redactions {}", manualRedactions);
+        if (manualRedactions != null) {
+
+            var manualRedactionLogEntries = addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+
+            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
+
+            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
+
+            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+
+                processRedactionLogEntry(manualRedactionWrappers.stream()
+                        .filter(mr -> entry.getId().equals(mr.getId()))
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
+
+                entry.setComments(manualRedactions.getComments().get(entry.getId()));
+
+                if (excludedPages != null && !excludedPages.isEmpty()) {
+                    entry.getPositions().forEach(pos -> {
+                        if (excludedPages.contains(pos.getPage())) {
+                            entry.setExcluded(true);
+                        }
+                    });
+                }
+            }
+
+        }
+
+        return redactionLog;
+    }
+
+
+    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
+
+        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
+
+        manualRedactions.getImageRecategorizations().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getForceRedacts().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getManualLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getId(), item.getRequestDate(), item));
+            }
+        });
+
+        Collections.sort(manualRedactionWrappers);
+
+        return manualRedactionWrappers;
+    }
+
+
+    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+
+        manualRedactionWrappers.forEach(mrw -> {
+
+            if (mrw.getItem() instanceof ManualImageRecategorization) {
+                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
+                String manualOverrideReason = null;
+                if (imageRecategorization.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setType(imageRecategorization.getType());
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
+                } else if (imageRecategorization.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setRecategorizationType(imageRecategorization.getType());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(imageRecategorization.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.RECATEGORIZE);
+            }
+
+            if (mrw.getItem() instanceof IdRemoval) {
+                var manualRemoval = (IdRemoval) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setRedacted(false);
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), true));
+                } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionUserId(manualRemoval.getUser());
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                redactionLogEntry.setDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+                redactionLogEntry.setDossierDictionaryEntry(manualRemoval.isRemoveFromDictionary());
+            }
+
+            if (mrw.getItem() instanceof ManualForceRedact) {
+                var manualForceRedact = (ManualForceRedact) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setRedacted(true);
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry
+                            .isRedacted(), false));
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force redact");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualForceRedact.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
+
+            }
+
+            if (mrw.getItem() instanceof ManualLegalBasisChange) {
+                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualLegalBasisChange.getStatus().equals(Status.APPROVED)) {
+                    redactionLogEntry.setStatus(Status.APPROVED);
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
+                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                } else if (manualLegalBasisChange.getStatus().equals(Status.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
+                    redactionLogEntry.setStatus(Status.REQUESTED);
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry
+                            .isRedacted(), false));
+                    redactionLogEntry.setLegalBasisChangeValue(manualLegalBasisChange.getLegalBasis());
+                } else {
+                    redactionLogEntry.setStatus(Status.DECLINED);
+                }
+
+                redactionLogEntry.setManualRedactionUserId(manualLegalBasisChange.getUser());
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.setManual(true);
+                redactionLogEntry.setManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+            }
+
+        });
+
+    }
+
+
+    private String mergeReasonIfNecessary(String currentReason, String addition) {
+
+        if (currentReason != null) {
+            if (!currentReason.contains(addition)) {
+                return currentReason + addition;
+            }
+            return currentReason;
+        } else {
+            return "";
+        }
+    }
+
+
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
+
+        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
+
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
+
+            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry
+                        .getId(), dossierTemplateId);
+                redactionLogEntry.setPositions(manualRedactionEntry.getPositions());
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getId()));
+                redactionLogEntries.add(redactionLogEntry);
+            }
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus()
+                .equals(Status.APPROVED) && (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String dossierTemplateId) {
+
+        return RedactionLogEntry.builder()
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
+                .reason(manualRedactionEntry.getReason())
+                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .value(manualRedactionEntry.getValue())
+                .type(manualRedactionEntry.getType())
+                .redacted(true)
+                .isHint(false)
+                .section(null)
+                .sectionNumber(-1)
+                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .manualRedactionUserId(manualRedactionEntry.getUser())
+                .build();
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
+
+        if (requested) {
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
+        }
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
+
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    @Data
+    @AllArgsConstructor
+    private static class ManualRedactionWrapper implements Comparable<ManualRedactionWrapper> {
+
+        private String id;
+        private OffsetDateTime date;
+        private Object item;
+
+
+        @Override
+        public int compareTo(ManualRedactionWrapper o) {
+
+            return this.date.compareTo(o.date);
+        }
+
+    }
+
+}
+
@@ -5,6 +5,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncre
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

@@ -17,7 +18,6 @@ import java.util.stream.Collectors;
@SuppressWarnings("PMD")
 public class EntitySearchUtils {

-
    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {

        String inputString = sectionText.toLowerCase(Locale.ROOT);
@@ -38,9 +38,7 @@ public class EntitySearchUtils {

                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    if (value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())) {
-                        return true;
-                    }
+                    return true;
                }
            } while (startIndex > -1);
        }
@@ -98,8 +96,8 @@ public class EntitySearchUtils {
                    .sorted(Comparator.comparing(Entity::getStart))
                    .collect(Collectors.toList());
            Entity firstEntity = orderedEntities.get(0);
-            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
-                    .getType()), firstEntity.getTargetSequences());
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord()
+                    .trim(), dictionary.isCaseInsensitiveDictionary(firstEntity.getType()), firstEntity.getTargetSequences());

            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
                try {
@@ -133,6 +131,7 @@ public class EntitySearchUtils {


    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
+
        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
    }

@@ -148,9 +147,11 @@ public class EntitySearchUtils {
        entities.add(found);
    }

+
    public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
        // HashSet keeps old value but we want the new.
        entities.removeAll(found);
        entities.addAll(found);
    }
+
 }
@@ -12,7 +12,7 @@ public class TextNormalizationUtilities {
     * @return Text without line-break hyphenation.
     */
    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R", "$1");
    }

 }
@@ -118,7 +118,7 @@ public class ImageMergeService {
            //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());
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage(), image1.isHasTransparency() || image2.isHasTransparency());
            // Graphics need to be disposed

            image1.getImage().flush();
@@ -15,4 +15,6 @@ public class RedactionServiceSettings {

    private float maxImageCropboxRatio = 0.9f;

+    private int analysisVersion = 1;
+
 }
@@ -18,7 +18,9 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.service.StorageService;
+
 import lombok.SneakyThrows;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -84,7 +86,6 @@ public class RedactionIntegrationTest {

    private static final String PII = "PII";

-
    @Autowired
    private RedactionController redactionController;

@@ -127,6 +128,7 @@ public class RedactionIntegrationTest {
    private final Map<String, Integer> rankTypeMap = new HashMap<>();
    private final Colors colors = new Colors();
    private final Map<String, Long> reanlysisVersions = new HashMap<>();
+    private final Set<String> deleted = new HashSet<>();

    private final static String TEST_DOSSIER_TEMPLATE_ID = "123";
    private final static String TEST_DOSSIER_ID = "123";
@@ -152,18 +154,20 @@ public class RedactionIntegrationTest {
            return kieServices.newKieContainer(kieModule.getReleaseId());
        }

+
        @Bean
        @Primary
        public StorageService inmemoryStorage() {
+
            return new FileSystemBackedStorageService();
        }

-
    }


    @After
    public void cleanupStorage() {
+
        if (this.storageService instanceof FileSystemBackedStorageService) {
            ((FileSystemBackedStorageService) this.storageService).clearStorage();
        }
@@ -179,7 +183,8 @@ public class RedactionIntegrationTest {
        loadDictionaryForTest();
        loadTypeForTest();
        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(0L);
-        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse.builder()
+        when(dictionaryClient.getAllTypes(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(TypeResponse
+                .builder()
                .types(getTypeResponse())
                .build());

@@ -188,7 +193,7 @@ public class RedactionIntegrationTest {
                .types(List.of(TypeResult.builder()
                        .type(DOSSIER_REDACTIONS)
                        .dossierTemplateId(TEST_DOSSIER_TEMPLATE_ID)
-                        .hexColor( "#ffe187")
+                        .hexColor("#ffe187")
                        .isHint(hintTypeMap.get(DOSSIER_REDACTIONS))
                        .isCaseInsensitive(caseInSensitiveMap.get(DOSSIER_REDACTIONS))
                        .isRecommendation(recommendationTypeMap.get(DOSSIER_REDACTIONS))
@@ -196,26 +201,42 @@ public class RedactionIntegrationTest {
                        .build()))
                .build());

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
-        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SPONSOR, false));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(HINT_ONLY, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(TEST_METHOD, false));
        when(dictionaryClient.getDictionaryForType(PII, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PII, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
-        when(dictionaryClient.getDictionaryForType(PURITY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(PURITY, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR, false));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS, false));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));
+        when(dictionaryClient.getDictionaryForType(PURITY, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(PURITY, false));
        when(dictionaryClient.getDictionaryForType(IMAGE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(IMAGE, false));
        when(dictionaryClient.getDictionaryForType(OCR, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(OCR, false));
        when(dictionaryClient.getDictionaryForType(LOGO, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(LOGO, false));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(SIGNATURE, false));
-        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(FORMULA, false));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(SIGNATURE, false));
+        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FORMULA, false));
        when(dictionaryClient.getDictionaryForType(DOSSIER_REDACTIONS, TEST_DOSSIER_TEMPLATE_ID, TEST_DOSSIER_ID)).thenReturn(getDictionaryResponse(DOSSIER_REDACTIONS, true));
        when(dictionaryClient.getColors(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(colors);
    }
@@ -477,7 +498,8 @@ public class RedactionIntegrationTest {

        return DictionaryResponse.builder()
                .hexColor(typeColorMap.get(type))
-                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary.get(type)))
+                .entries(isDossierDictionary ? toDictionaryEntry(dossierDictionary.get(type)) : toDictionaryEntry(dictionary
+                        .get(type)))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
                .isRecommendation(recommendationTypeMap.get(type))
@@ -490,7 +512,8 @@ public class RedactionIntegrationTest {

        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
        entries.forEach(entry -> {
-            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, false));
+            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, deleted
+                    .contains(entry) ? true : false));
        });
        return dictionaryEntries;
    }
@@ -498,6 +521,7 @@ public class RedactionIntegrationTest {

    @Test
    public void test270Rotated() {
+
        AnalyzeRequest request = prepareStorage("files/Minimal Examples/270Rotated.pdf");
        MemoryStats.printMemoryStats();
        AnalyzeResult result = reanalyzeService.analyze(request);
@@ -508,12 +532,14 @@ public class RedactionIntegrationTest {
    @Test
    @Ignore
    public void testLargeScannedFileOOM() {
+
        AnalyzeRequest request = prepareStorage("scanned/VV-377031.pdf");
        MemoryStats.printMemoryStats();
        AnalyzeResult result = reanalyzeService.analyze(request);
        assertThat(result).isNotNull();
    }

+
    @Test
    public void testMergedImages() throws IOException {

@@ -552,14 +578,13 @@ public class RedactionIntegrationTest {
        long rend = System.currentTimeMillis();
        System.out.println("reanalysis analysis duration: " + (rend - rstart));

-
        long end = System.currentTimeMillis();

        System.out.println("duration: " + (end - start));

-
    }

+
    @Test
    @Ignore
    public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
@@ -635,7 +660,12 @@ public class RedactionIntegrationTest {
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setExcludedPages(Set.of(1));

-        request.setFileAttributes(List.of(FileAttribute.builder().id("fileAttributeId").label("Vertebrate Study").placeholder("{fileattributes.vertebrateStudy}").value("true").build()));
+        request.setFileAttributes(List.of(FileAttribute.builder()
+                .id("fileAttributeId")
+                .label("Vertebrate Study")
+                .placeholder("{fileattributes.vertebrateStudy}")
+                .value("true")
+                .build()));

        AnalyzeResult result = reanalyzeService.analyze(request);

@@ -683,12 +713,18 @@ public class RedactionIntegrationTest {
        dictionary.get(AUTHOR).add("physical");
        reanlysisVersions.put("physical", 2L);

-//        dictionary.get(VERTEBRATE).add("s-metolachlor");
-//        reanlysisVersions.put("s-metolachlor", 3L);
+        deleted.add("David Chubb");
+
+        dictionary.get(FALSE_POSITIVE).add("David Chubb");
+        reanlysisVersions.put("David Chubb", 3L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(3L);

-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(VERTEBRATE, false));
+
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_DOSSIER_TEMPLATE_ID, DictionaryResource.GLOBAL_DOSSIER))
+                .thenReturn(getDictionaryResponse(FALSE_POSITIVE, false));

        start = System.currentTimeMillis();

@@ -702,10 +738,8 @@ public class RedactionIntegrationTest {

        request.setManualRedactions(manualRedactions);

-
        AnalyzeResult reanalyzeResult = reanalyzeService.reanalyze(request);

-
        redactionLog = redactionStorageService.getRedactionLog(TEST_DOSSIER_ID, TEST_FILE_ID);

        end = System.currentTimeMillis();
@@ -775,7 +809,6 @@ public class RedactionIntegrationTest {
                .status(Status.APPROVED)
                .build()));

-
        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
        manualRedactions.getComments().put(manualAddId, List.of(comment));
@@ -790,12 +823,10 @@ public class RedactionIntegrationTest {

 //        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);

-
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());
        request.setManualRedactions(manualRedactions);
        AnalyzeResult result = reanalyzeService.analyze(request);

-
        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
@@ -816,7 +847,6 @@ public class RedactionIntegrationTest {
                .fileId(TEST_FILE_ID)
                .build());

-
        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
            fileOutputStream.write(annotateResponse.getDocument());
        }
@@ -833,7 +863,6 @@ public class RedactionIntegrationTest {
        System.out.println("classificationTest");
        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");

-
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        RedactionRequest redactionRequest = RedactionRequest.builder()
@@ -934,8 +963,10 @@ public class RedactionIntegrationTest {
        });
    }

+
    @SneakyThrows
    private AnalyzeRequest prepareStorage(String file) {
+
        ClassPathResource pdfFileResource = new ClassPathResource(file);

        return prepareStorage(pdfFileResource.getInputStream());
@@ -967,7 +998,6 @@ public class RedactionIntegrationTest {
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");

-
        AnalyzeRequest request = prepareStorage(pdfFileResource.getInputStream());

        AnalyzeResult result = reanalyzeService.analyze(request);
@@ -1676,7 +1676,6 @@ da Silva Rejane
 Das R
 Das, R.
 Daughtry, CST
-David Chubb
 David Chubb|Lorraine Britton
 David Clarke
 Davies
@@ -235,4 +235,5 @@ N/A
 No details reported
 Not available
 Test facility
-TBD
+TBD
+David Chubb
Author	SHA1	Message	Date
Dominique Eifländer	7a7733b8e4	Added equalsIgnoreCase fileattributes methods for rules	2021-08-20 14:51:22 +02:00
Dominique Eiflaender	952a00b19c	Pull request #213 : RED-1755: Calculate falgs in file-management-service async Merge in RED/redaction-service from RED-1755-2 to release/2.52.x * commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15': RED-1755: Calculate falgs in file-management-service async	2021-08-18 11:58:28 +02:00
Dominique Eifländer	dd585a13fd	RED-1755: Calculate falgs in file-management-service async	2021-08-18 10:02:37 +02:00
Dominique Eiflaender	2d305bd6fe	Pull request #210 : RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages Merge in RED/redaction-service from RED-2015 to release/2.52.x * commit '9650ff75ca44dbb0dc0bb74552a03d3d938015cb': RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 12:21:59 +02:00
Dominique Eifländer	9650ff75ca	RED-2015: Fixed (Manual) Redactions in download reports/files for excluded pages	2021-08-17 11:28:52 +02:00
Timo Bejan	b2acdc646d	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:56:23 +02:00
Timo Bejan	dc2508d0d0	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 13:19:53 +02:00
Timo Bejan	e5099f321e	RedactionLogMergeService.java edited online with Bitbucket	2021-08-13 12:50:15 +02:00
Timo Bejan	de2282bc24	Pull request #209 : logs Merge in RED/redaction-service from realease/2.52x-fix to release/2.52.x * commit 'b1f73fb5b169710a56a74a9ecb55b7e0cc4b7b88': logs	2021-08-13 12:33:09 +02:00
Timo Bejan	b1f73fb5b1	logs	2021-08-13 13:28:07 +03:00
Timo Bejan	fe737108e7	Pull request #208 : Proper Order of manual actions based on time Merge in RED/redaction-service from realease/2.52x-fix to release/2.52.x * commit 'fe95224471def99ee158dbf150f9985064313070': Proper Order of manual actions based on time	2021-08-13 10:27:31 +02:00
Timo Bejan	fe95224471	Proper Order of manual actions based on time	2021-08-13 11:22:52 +03:00
Timo Bejan	ff7166ed96	Pull request #205 : added user-id to all manual entries Merge in RED/redaction-service from RED-1788 to master * commit '30715cdcb85e94911c3903fe95b1cb902ed6556f': added user-id to all manual entries	2021-08-05 14:50:21 +02:00
Timo Bejan	30715cdcb8	added user-id to all manual entries	2021-08-05 15:35:06 +03:00
Timo Bejan	d21ce3f495	Pull request #204 : cleanup Merge in RED/redaction-service from RED-1788 to master * commit '4bdca5644a7296bd542278ffa2f64e670855fbe5': cleanup	2021-08-05 14:30:08 +02:00
Timo Bejan	4bdca5644a	cleanup	2021-08-05 13:13:48 +03:00
Timo Bejan	779f5c725c	Pull request #203 : fixed typo Merge in RED/redaction-service from RED-1788 to master * commit 'b08cdd3a07f763c6b310a3403c69d4b9652a0e5c': cleaned up code, added analysisVersion for analyseresult and interogation, usefull later fixed typo	2021-08-05 10:03:24 +02:00
Timo Bejan	b08cdd3a07	cleaned up code, added analysisVersion for analyseresult and interogation, usefull later	2021-08-05 10:59:01 +03:00
Timo Bejan	af1fb03025	fixed typo	2021-08-05 10:37:03 +03:00
Timo Bejan	a1e9dbb3da	Pull request #202 : smart reanalysis based on sections to reanalyse provided by search service Merge in RED/redaction-service from RED-1788 to master * commit 'cf12e58c77b30fd4ff790a3b038b3ba625aa5a28': smart reanalysis based on sections to reanalyse provided by search service	2021-07-29 20:42:27 +02:00
Timo Bejan	cf12e58c77	smart reanalysis based on sections to reanalyse provided by search service	2021-07-29 21:07:14 +03:00
Dominique Eifländer	77ece8b0d6	Simplyfied hyphen removal regex	2021-07-29 13:15:21 +02:00
Dominique Eiflaender	6c375b5b7a	Pull request #201 : Fixed dossier dictionary and dictionary rank sorting Merge in RED/redaction-service from RankFix to master * commit '289077e5e386e3a0785e2c849ae06bcb01202d5c': Fixed dossier dictionary and dictionary rank sorting	2021-07-29 11:52:25 +02:00
Dominique Eifländer	289077e5e3	Fixed dossier dictionary and dictionary rank sorting	2021-07-29 11:46:15 +02:00
Dominique Eiflaender	2c4c52d891	Pull request #199 : RED-1806: Use localDictionary also in Reanlysis to fix problem at removing values from false_positive that affect rules that should find values in entire document Merge in RED/redaction-service from RED-1806 to master * commit '0832ea15c09335cfb0d9f0139764ab6c99a22423': RED-1806: Use localDictionary also in Reanlysis to fix problem at removing values from false_positive that affect rules that should find values in entire document	2021-07-27 13:08:43 +02:00
Dominique Eifländer	0832ea15c0	RED-1806: Use localDictionary also in Reanlysis to fix problem at removing values from false_positive that affect rules that should find values in entire document	2021-07-26 15:51:00 +02:00
Timo Bejan	62f755c416	Pull request #198 : manual redaction fixes Merge in RED/redaction-service from RED-1839 to master * commit '00dd6b90081e7e99ac64a27d115a195d6ab0bc2a': manual redaction fixes	2021-07-22 21:35:43 +02:00
Timo	00dd6b9008	manual redaction fixes	2021-07-22 22:26:16 +03:00
Timo Bejan	d5bb55166d	Pull request #197 : some logs Merge in RED/redaction-service from RED-1839 to master * commit 'da14646cb7d8057c8189736565a024ef13921502': some logs	2021-07-22 18:26:44 +02:00
Timo	da14646cb7	some logs	2021-07-22 18:52:36 +03:00
Timo Bejan	22531168f0	Pull request #196 : RED-1839 Merge in RED/redaction-service from RED-1839 to master * commit '26e73121e9f3526c2fd68a3965f17adf74e28ede': fixed pmd fixed pmd redaction-log preview generation and removal of manual redactions from redaction-log redaction-log preview generation and removal of manual redactions from redaction-log	2021-07-22 08:37:49 +02:00
Timo	26e73121e9	fixed pmd	2021-07-21 17:28:57 +03:00
Timo	25e5594750	fixed pmd	2021-07-21 17:25:50 +03:00
Timo	d2ffb09987	redaction-log preview generation and removal of manual redactions from redaction-log	2021-07-21 16:02:07 +03:00
Timo	1ac294fc01	redaction-log preview generation and removal of manual redactions from redaction-log	2021-07-21 16:02:07 +03:00
Dominique Eiflaender	b75dbde563	Pull request #195 : RED-1813: Added imageHasTransparency to redaction log Merge in RED/redaction-service from RED-1813 to master * commit 'ba0cde241fd11ed6fe0bd623561470a108e1b89f': RED-1813: Added imageHasTransparency to redaction log	2021-07-20 10:10:20 +02:00
Dominique Eifländer	ba0cde241f	RED-1813: Added imageHasTransparency to redaction log	2021-07-20 10:02:00 +02:00
Timo Bejan	28c8cebe1a	Pull request #194 : RED-1830 Merge in RED/redaction-service from RED-1830 to master * commit 'e9c5b955805b42e3e62ae0aad7affcad05610833': fixed compile err add comments	2021-07-19 15:49:11 +02:00
Timo	e9c5b95580	fixed compile err	2021-07-19 16:30:29 +03:00
Timo	e809004f16	add comments	2021-07-19 14:57:59 +03:00
Dominique Eiflaender	04c7993b4b	Pull request #193 : RED-1184: Always find reanaylsis sections with caseinsentive values to remove values if type has changed from caseinsensitive to casesensitive Merge in RED/redaction-service from RED-1184 to master * commit 'a39bbd9afa814577543a33c35dd27c96ec993e79': RED-1184: Always find reanaylsis sections with caseinsentive values to remove values if type has changed from caseinsensitive to casesensitive	2021-07-19 13:17:31 +02:00
Dominique Eifländer	a39bbd9afa	RED-1184: Always find reanaylsis sections with caseinsentive values to remove values if type has changed from caseinsensitive to casesensitive	2021-07-19 13:12:20 +02:00
Timo Bejan	26def889d8	Pull request #192 : RED-1830 Merge in RED/redaction-service from RED-1830 to master * commit 'd4486ea6f4d31d68a2c75ec5e192f2a3bd62443c': fixed PMD fixed undo after reanalysis	2021-07-19 12:02:54 +02:00
Timo	d4486ea6f4	fixed PMD	2021-07-19 11:59:53 +03:00
Timo	0b89c55a1d	fixed undo after reanalysis	2021-07-19 11:57:29 +03:00
Timo Bejan	6c0b567299	Pull request #191 : fixed undo after reanalysis Merge in RED/redaction-service from RED-1830 to master * commit '93844d8e76e0806cf00292b591a9f97ee8e61230': fixed undo after reanalysis	2021-07-19 10:46:38 +02:00
Timo	93844d8e76	fixed undo after reanalysis	2021-07-19 11:39:19 +03:00