RED-4064: Fixed find dictionary entries at position where rules entries are resized to smaller entries

Pull request #395 : RED-3816: Bugfix with adding images to sections
Merge in RED/redaction-service from bugfix/RED-3816 to master * commit 'c1192ceefd0717958badc27d2c2a65a8059952a4': RED-3816: Bugfix with adding images to sections
2022-06-02 10:32:48 +02:00 · 2022-05-30 14:43:35 +02:00 · 2022-05-30 13:52:57 +02:00 · 2022-05-24 11:09:08 +02:00 · 2022-05-24 09:00:07 +02:00 · 2022-05-23 18:48:10 +02:00
23 changed files with 866 additions and 188 deletions
@@ -21,6 +21,12 @@
    </properties>

    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>storage-commons</artifactId>
@@ -9,8 +9,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;
+
@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
@@ -22,5 +26,10 @@ public class Application {
        SpringApplication.run(Application.class, args);
    }

+    @Bean
+    public TimedAspect timedAspect(MeterRegistry registry) {
+        return new TimedAspect(registry);
+    }
+

 }
@@ -1,16 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.beans.BeanUtils;
+
 import com.dslplatform.json.CompiledJson;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.beans.BeanUtils;

@Data
+@Builder
@NoArgsConstructor
+@AllArgsConstructor
@CompiledJson
 public class RedTextPosition {

@@ -1,24 +1,30 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.text.TextPosition;
+
 import com.dslplatform.json.CompiledJson;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pdfbox.text.TextPosition;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;

@Slf4j
@Data
+@Builder
@CompiledJson
@NoArgsConstructor
+@AllArgsConstructor
@JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {

@@ -1,17 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity implements ReasonHolder {

@@ -1,15 +1,18 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+
@Data
+@Builder
@RequiredArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
@@ -1,14 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-
 import com.dslplatform.json.CompiledJson;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
+@Builder
@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
@@ -1,28 +1,38 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-
-import com.iqser.red.service.redaction.v1.model.ArgumentType;
-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.model.FileAttribute;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

+import org.apache.commons.lang3.StringUtils;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.redaction.v1.model.ArgumentType;
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
@Data
@Slf4j
@Builder
@@ -61,12 +71,19 @@ public class Section {
    @Builder.Default
    private List<FileAttribute> fileAttributes = new ArrayList<>();

+    @Builder.Default
+    private List<SectionArea> sectionAreas = new ArrayList<>();
+
+    private ManualRedactions manualRedactions;
+

    @SuppressWarnings("unused")
    @WhenCondition
    public void addAiEntities(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.TYPE) String asType) {

-        Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
+        Set<Entity> entitiesOfType = nerEntities.stream()
+                .filter(nerEntity -> nerEntity.getType().equals(type))
+                .collect(Collectors.toSet());
        List<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toList());
        Set<Entity> found = EntitySearchUtils.findEntities(searchText, new SearchImplementation(values, dictionary.isCaseInsensitiveDictionary(asType)), dictionary.getType(asType), new FindEntityDetails(asType, headline, sectionNumber, false, false, Engine.NER, EntityType.RECOMMENDATION));
        EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
@@ -93,15 +110,21 @@ public class Section {
        nerEntities.removeAll(entitiesOfType);
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public void combineAiTypes(@Argument(ArgumentType.TYPE) String startType, @Argument(ArgumentType.TYPE) String combineTypes,
-                               @Argument(ArgumentType.INTEGER) int maxDistanceBetween, @Argument(ArgumentType.TYPE) String asType,
-                               @Argument(ArgumentType.INTEGER) int minPartMatches, @Argument(ArgumentType.BOOLEAN) boolean allowDuplicateTypes) {
+    public void combineAiTypes(@Argument(ArgumentType.TYPE) String startType,
+                               @Argument(ArgumentType.TYPE) String combineTypes,
+                               @Argument(ArgumentType.INTEGER) int maxDistanceBetween,
+                               @Argument(ArgumentType.TYPE) String asType,
+                               @Argument(ArgumentType.INTEGER) int minPartMatches,
+                               @Argument(ArgumentType.BOOLEAN) boolean allowDuplicateTypes) {

        Set<String> combineSet = Set.of(combineTypes.split(","));

-        List<Entity> sorted = nerEntities.stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
+        List<Entity> sorted = nerEntities.stream()
+                .sorted(Comparator.comparing(Entity::getStart))
+                .collect(Collectors.toList());
        Set<Entity> found = new HashSet<>();
        int start = -1;
        int lastEnd = -1;
@@ -158,49 +181,67 @@ public class Section {
        }
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
+                                           @Argument(ArgumentType.STRING) String value) {

-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
+                                                    @Argument(ArgumentType.STRING) String value) {

-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
+                                              @Argument(ArgumentType.STRING) String value) {

-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id,
+                                                     @Argument(ArgumentType.STRING) String value) {

-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder,
+                                                              @Argument(ArgumentType.STRING) String value) {

        return fileAttributes != null && fileAttributes.stream()
                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
+    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label,
+                                                        @Argument(ArgumentType.STRING) String value) {

-        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
    public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {
@@ -209,6 +250,7 @@ public class Section {
        return tabularData != null && tabularData.containsKey(cleanHeaderName);
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
    public boolean aiMatchesType(@Argument(ArgumentType.TYPE) String type) {
@@ -216,6 +258,7 @@ public class Section {
        return nerEntities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {
@@ -223,6 +266,7 @@ public class Section {
        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
    public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {
@@ -230,6 +274,7 @@ public class Section {
        return images.stream().anyMatch(image -> !image.isIgnored() && image.getType().equals(type));
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {
@@ -237,9 +282,11 @@ public class Section {
        return StringUtils.containsIgnoreCase(headline, word);
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean containsRegEx(@Argument(ArgumentType.STRING) String regEx, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive) {
+    public boolean containsRegEx(@Argument(ArgumentType.STRING) String regEx,
+                                 @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive) {

        var compiledPattern = Patterns.getCompiledPattern(regEx, patternCaseInsensitive);

@@ -248,19 +295,26 @@ public class Section {
        return matcher.find();
    }

+
    @SuppressWarnings("unused")
    @WhenCondition
-    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName, @Argument(ArgumentType.STRING) String value) {
+    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName,
+                             @Argument(ArgumentType.STRING) String value) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

-        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).toString().equals(value);
+        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
+                .toString()
+                .equals(value);
    }

-    @SuppressWarnings("unused")
+
    @ThenAction
-    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String prefixPattern,
-                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+    @SuppressWarnings("unused")
+    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type,
+                                    @Argument(ArgumentType.REGEX) String prefixPattern,
+                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                    @Argument(ArgumentType.INTEGER) int group) {

        expandByPrefixRegEx(type, prefixPattern, patternCaseInsensitive, group, null);
    }
@@ -268,11 +322,15 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String prefixPattern,
-                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+    public void expandByPrefixRegEx(@Argument(ArgumentType.TYPE) String type,
+                                    @Argument(ArgumentType.REGEX) String prefixPattern,
+                                    @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                    @Argument(ArgumentType.INTEGER) int group,
                                    @Argument(ArgumentType.REGEX) String valuePattern) {

-        if (StringUtils.isEmpty(prefixPattern)) return;
+        if (StringUtils.isEmpty(prefixPattern)) {
+            return;
+        }

        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
        var compiledPrefixPattern = Patterns.getCompiledPattern(prefixPattern, patternCaseInsensitive);
@@ -317,8 +375,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group) {

        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
    }
@@ -326,11 +386,15 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
-                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group,
                              @Argument(ArgumentType.REGEX) String valuePattern) {

-        if (StringUtils.isEmpty(suffixPattern)) return;
+        if (StringUtils.isEmpty(suffixPattern)) {
+            return;
+        }

        var compiledValuePattern = valuePattern == null ? null : Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
        var compiledSuffixPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);
@@ -374,7 +438,9 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+    public void redactImage(@Argument(ArgumentType.TYPE) String type,
+                            @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                            @Argument(ArgumentType.STRING) String reason,
                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactImage(type, ruleNumber, reason, legalBasis, true);
@@ -383,7 +449,9 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNotImage(@Argument(ArgumentType.TYPE) String type,
+                               @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                               @Argument(ArgumentType.STRING) String reason) {

        redactImage(type, ruleNumber, reason, null, false);
    }
@@ -391,7 +459,8 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                       @Argument(ArgumentType.STRING) String reason,
                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redact(type, ruleNumber, reason, legalBasis, true);
@@ -400,7 +469,8 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                          @Argument(ArgumentType.STRING) String reason) {

        redact(type, ruleNumber, reason, null, false);
    }
@@ -408,8 +478,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason,
+    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType,
+                                @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                @Argument(ArgumentType.STRING) String reason,
                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
@@ -418,8 +490,11 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.TYPE) String asType,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                   @Argument(ArgumentType.STRING) String reason) {

        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, null, false);

@@ -428,9 +503,12 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.STRING) String reason,
+                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
    }
@@ -438,8 +516,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                 @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                 @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                 @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
+                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
                                 @Argument(ArgumentType.STRING) String reason) {

        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
@@ -448,9 +528,12 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop,
+                              @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                              @Argument(ArgumentType.STRING) String reason,
+                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
    }
@@ -458,8 +541,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+    public void redactNotBetween(@Argument(ArgumentType.STRING) String start,
+                                 @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                 @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                 @Argument(ArgumentType.STRING) String reason) {

        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
@@ -468,9 +553,13 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
-                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.STRING) String stop,
+                                   @Argument(ArgumentType.TYPE) String asType,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                   @Argument(ArgumentType.STRING) String reason,
+                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
    }
@@ -478,8 +567,11 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start,
+                                      @Argument(ArgumentType.STRING) String stop,
+                                      @Argument(ArgumentType.TYPE) String asType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                      @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
                                      @Argument(ArgumentType.STRING) String reason) {

        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
@@ -488,8 +580,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
-                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason,
+    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader,
+                           @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
+                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
+                           @Argument(ArgumentType.STRING) String reason,
                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
@@ -498,8 +592,11 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
-                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations,
+                              @Argument(ArgumentType.STRING) String reason) {

        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
    }
@@ -507,9 +604,13 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                          @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                          @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                          @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                          @Argument(ArgumentType.INTEGER) int group,
+                                          @Argument(ArgumentType.TYPE) String asType,
+                                          @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                          @Argument(ArgumentType.STRING) String reason,
+                                          @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
    }
@@ -517,9 +618,12 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                             @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
-                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                             @Argument(ArgumentType.INTEGER) int group,
+                                             @Argument(ArgumentType.TYPE) String asType,
+                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                             @Argument(ArgumentType.STRING) String reason) {

        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
    }
@@ -527,8 +631,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {
+    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group,
+                                         @Argument(ArgumentType.TYPE) String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -545,11 +651,14 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
-                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type,
+                                      @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                      @Argument(ArgumentType.STRING) String reason) {

-
-        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
+        Set<Entity> references = entities.stream()
+                .filter(entity -> entity.getType().equals(referenceType))
+                .collect(Collectors.toSet());

        entities.forEach(entity -> {
            if (entity.getType().equals(type)) {
@@ -564,8 +673,11 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix, @Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix,
+                                   @Argument(ArgumentType.TYPE) String type,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.STRING) String reason,
+                                   @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        entities.forEach(entity -> {
            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
@@ -580,13 +692,16 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
-                             @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType,
+                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                             @Argument(ArgumentType.STRING) String reason,
+                             @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE, false);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }

+
    @ThenAction
    @SuppressWarnings("unused")
    public void ignore(@Argument(ArgumentType.TYPE) String type) {
@@ -594,18 +709,22 @@ public class Section {
        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.ENTITY));
    }

+
    @ThenAction
    @SuppressWarnings("unused")
    public void ignoreRecommendations(@Argument(ArgumentType.TYPE) String type) {

-        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType().equals(EntityType.RECOMMENDATION));
+        entities.removeIf(entity -> entity.getType().equals(type) && entity.getEntityType()
+                .equals(EntityType.RECOMMENDATION));
    }


    @ThenAction
    @SuppressWarnings("unused")
-    public void expandToFalsePositiveByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.STRING) String pattern,
-                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+    public void expandToFalsePositiveByRegEx(@Argument(ArgumentType.TYPE) String type,
+                                             @Argument(ArgumentType.STRING) String pattern,
+                                             @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                             @Argument(ArgumentType.INTEGER) int group) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -634,8 +753,10 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
-                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {
+    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern,
+                                         @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group,
+                                         @Argument(ArgumentType.TYPE) String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -653,7 +774,8 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType) {
+    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value,
+                                  @Argument(ArgumentType.TYPE) String asType) {

        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE, false);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
@@ -662,7 +784,8 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType) {
+    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start,
+                                   @Argument(ArgumentType.TYPE) String asType) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -687,14 +810,53 @@ public class Section {

    @ThenAction
    @SuppressWarnings("unused")
-    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type) {
+    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.TYPE) String type) {

        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
    }


-    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis,
-                                           boolean redaction) {
+    @ThenAction
+    @SuppressWarnings("unused")
+    public void redactSection(@Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.STRING) String reason,
+                              @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        for (SectionArea sectionArea : sectionAreas) {
+
+            RedRectangle2D position = RedRectangle2D.builder()
+                    .height(sectionArea.getHeight() + 4)
+                    .width(sectionArea.getWidth() + 4)
+                    .x(sectionArea.getTopLeft().getX() - 2)
+                    .y(sectionArea.getTopLeft().getY() - 2)
+                    .build();
+
+            log.debug("SectionArea: {}", sectionArea);
+            log.debug("Position {}", position.toString());
+
+            Image image = Image.builder()
+                    .page(sectionArea.getPage())
+                    .position(position)
+                    .redaction(true)
+                    .hasTransparency(false)
+                    .sectionNumber(sectionNumber)
+                    .section(headline)
+                    .matchedRule(ruleNumber)
+                    .legalBasis(legalBasis)
+                    .redactionReason(reason)
+                    .type(type)
+                    .build();
+
+            images.add(image);
+        }
+    }
+
+
+    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType,
+                                           int ruleNumber, String reason, String legalBasis, boolean redaction) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
        Matcher matcher = compiledPattern.matcher(searchText);
@@ -709,11 +871,12 @@ public class Section {
    }


-    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine, boolean asRecommendation) {
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted,
+                                     int ruleNumber, String reason, String legalBasis, Engine engine,
+                                     boolean asRecommendation) {

        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
-        Set<Entity> found = EntitySearchUtils.findEntities(text, new SearchImplementation(value, caseInsensitive), dictionary.getType(asType),
-                new FindEntityDetails(asType, headline, sectionNumber, false, false, engine, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY));
+        Set<Entity> found = EntitySearchUtils.findEntities(text, new SearchImplementation(value, caseInsensitive), dictionary.getType(asType), new FindEntityDetails(asType, headline, sectionNumber, false, false, engine, asRecommendation ? EntityType.RECOMMENDATION : EntityType.ENTITY));
        found.forEach(entity -> {
            if (redacted) {
                entity.setRedaction(true);
@@ -723,7 +886,26 @@ public class Section {
            }
        });

-        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
+        return applyResizeRedactions(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary));
+    }
+
+
+    private Set<Entity> applyResizeRedactions(Set<Entity> entitiesWithPositions) {
+
+        if (manualRedactions == null || manualRedactions.getResizeRedactions() == null || manualRedactions.getResizeRedactions().isEmpty()){
+            return entitiesWithPositions;
+        }
+
+        entitiesWithPositions.forEach(e -> e.getPositionSequences().forEach(pos -> {
+            manualRedactions.getResizeRedactions().forEach(resize -> {
+                if (resize.getAnnotationId().equals(pos.getId()) && resize.getValue().length() < e.getWord().length()) {
+                    int start = e.getWord().indexOf(resize.getValue());
+                    e.setStart(e.getStart() + start);
+                    e.setEnd(e.getEnd() - resize.getValue().length());
+                }
+            });
+        }));
+        return entitiesWithPositions;
    }


@@ -753,7 +935,8 @@ public class Section {
    }


-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, boolean addAsRecommendations, String reason, String legalBasis) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
+                              boolean addAsRecommendations, String reason, String legalBasis) {

        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

@@ -800,7 +983,8 @@ public class Section {
    }


-    private void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+    private void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
+                                 String legalBasis, boolean redaction) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -819,7 +1003,8 @@ public class Section {
    }


-    private void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis, boolean redaction) {
+    private void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber,
+                               String reason, String legalBasis, boolean redaction) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

@@ -835,7 +1020,8 @@ public class Section {
    }


-    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                               String reason, String legalBasis, boolean redaction) {

        String[] values = StringUtils.substringsBetween(searchText, start, stop);

@@ -855,7 +1041,8 @@ public class Section {
    }


-    private void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+    private void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                                    String reason, String legalBasis, boolean redaction) {

        String[] values = StringUtils.substringsBetween(text, start, stop);

@@ -22,6 +22,8 @@ import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import io.micrometer.core.annotation.Timed;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +57,7 @@ public class AnalyzeService {
    private final ImportedRedactionService importedRedactionService;


+    @Timed("analyzeDocumentStructure")
    public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {

        long startTime = System.currentTimeMillis();
@@ -103,6 +106,7 @@ public class AnalyzeService {
    }


+    @Timed("reanalyze")
    @SneakyThrows
    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {

@@ -170,6 +174,7 @@ public class AnalyzeService {
    }


+    @Timed("analyze")
    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {

        long startTime = System.currentTimeMillis();
@@ -1,6 +1,20 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
@@ -8,20 +22,23 @@ import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.FindEntityDetails;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

@Slf4j
@Service
@@ -82,9 +99,10 @@ public class EntityRedactionService {
                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
                        .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
                        .filter(idr -> idr.getRequestDate() != null)
-                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getAnnotationId().equals(idr.getAnnotationId()) && forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
                        .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());

+
                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
                        .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
                    for (Image image : reanalysisSection.getImages()) {
@@ -110,14 +128,14 @@ public class EntityRedactionService {
                }));
            }

+            log.debug("Section {}, Images: {}", reanalysisSection.getSectionNumber(), reanalysisSection.getImages());

            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
                    .isLocal(false)
                    .dictionaryTypes(dictionary.getTypes())
                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
                            .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
-                                    .stream())
-                            .collect(Collectors.toSet()) : entities.getEntities())
+                                    .stream()).collect(Collectors.toSet()) : entities.getEntities())
                    .nerEntities(entities.getNerEntities())
                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
                    .searchText(reanalysisSection.getSearchableText().toString())
@@ -127,7 +145,9 @@ public class EntityRedactionService {
                    .searchableText(reanalysisSection.getSearchableText())
                    .dictionary(dictionary)
                    .images(reanalysisSection.getImages())
+                    .sectionAreas(reanalysisSection.getSectionAreas())
                    .fileAttributes(analyzeRequest.getFileAttributes())
+                    .manualRedactions(analyzeRequest.getManualRedactions())
                    .build(), reanalysisSection.getSearchableText()));

        }
@@ -349,7 +349,7 @@ public class RedactionLogMergeService {
    }

    private List<RedactionLogComment> convert(List<Comment> comments) {
-        return comments.stream().map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(),
+        return comments == null ? null :comments.stream().map(c -> new RedactionLogComment(c.getId(), c.getUser(), c.getText(), c.getAnnotationId(),
                c.getFileId(), c.getDate(), c.getSoftDeletedTime())).collect(Collectors.toList());
    }

@@ -110,7 +110,8 @@ public class EntitySearchUtils {
                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word.getSectionNumber() == inner.getSectionNumber()) {
                    if (word.getEntityType().equals(EntityType.RECOMMENDATION) && inner.getEntityType().equals(EntityType.ENTITY)) {
                        wordsToRemove.add(word);
-                    } else {
+                    } else if(!(inner.getEntityType() == EntityType.FALSE_RECOMMENDATION && word.getEntityType() == EntityType.ENTITY ||
+                            inner.getEntityType() == EntityType.ENTITY && word.getEntityType() == EntityType.FALSE_RECOMMENDATION)) {
                        wordsToRemove.add(inner);
                    }
                }
@@ -165,6 +166,9 @@ public class EntitySearchUtils {

            if (existing.getType().equals(found.getType())) {
                existing.getEngines().addAll(found.getEngines());
+                existing.setLegalBasis(found.getLegalBasis());
+                existing.setMatchedRule(found.getMatchedRule());
+                existing.setRedactionReason(found.getRedactionReason());
                if (existing.getEntityType().equals(EntityType.RECOMMENDATION) && found.getEntityType().equals(EntityType.ENTITY)
                        || existing.getEntityType().equals(EntityType.ENTITY) && found.getEntityType().equals(EntityType.RECOMMENDATION)) {
                    existing.setEntityType(EntityType.ENTITY);
@@ -229,6 +233,9 @@ public class EntitySearchUtils {
                }
                var existingEntity = existingOptional.get();
                existingEntity.getEngines().addAll(toAdd.getEngines());
+                existingEntity.setLegalBasis(toAdd.getLegalBasis());
+                existingEntity.setMatchedRule(toAdd.getMatchedRule());
+                existingEntity.setRedactionReason(toAdd.getRedactionReason());
            } else {
                existing.add(toAdd);
            }
@@ -1,16 +1,31 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

-import com.iqser.red.service.redaction.v1.server.classification.model.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
+import com.iqser.red.service.redaction.v1.server.classification.model.Header;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;

-import java.util.*;
-import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
 public class SectionsBuilderService {

@@ -53,8 +68,7 @@ public class SectionsBuilderService {
                    continue;
                }

-                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification()
-                        .startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                    chunkBlock.setHeadline(lastHeadline);
                    if (document.isHeadlines()) {
@@ -100,17 +114,19 @@ public class SectionsBuilderService {

    public void addImagesToSections(Document document) {

-        Map<Integer, SortedSet<Paragraph>> paragraphMap = new HashMap<>();
+        Map<Integer, List<Paragraph>> paragraphMap = new HashMap<>();
        for (Paragraph paragraph : document.getParagraphs()) {
            for (AbstractTextContainer container : paragraph.getPageBlocks()) {
-                paragraphMap.computeIfAbsent(container.getPage(), x -> new TreeSet<>()).add(paragraph);
+
+                paragraphMap.computeIfAbsent(container.getPage(), c -> new ArrayList<>()).add(paragraph);
+
            }
        }

        if (paragraphMap.isEmpty()) {
            Paragraph paragraph = new Paragraph();
            document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
        }

        // first page is always a paragraph, else we can't process pages 1..N,
@@ -118,12 +134,12 @@ public class SectionsBuilderService {
        if (paragraphMap.get(1) == null) {
            Paragraph paragraph = new Paragraph();
            document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new ArrayList<>()).add(paragraph);
        }

        for (Page page : document.getPages()) {
            for (PdfImage image : page.getImages()) {
-                SortedSet<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
+                List<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
                if (paragraphsOnPage == null) {
                    int i = page.getPageNumber();
                    while (paragraphsOnPage == null) {
@@ -131,27 +147,63 @@ public class SectionsBuilderService {
                        i--;
                    }
                }
-
-                Float perviousEnd = 0f;
                for (Paragraph paragraph : paragraphsOnPage) {
-                    Float currentEnd = 0f;
+                    Float xMin = null;
+                    Float yMin = null;
+                    Float xMax = null;
+                    Float yMax = null;
+
                    for (AbstractTextContainer abs : paragraph.getPageBlocks()) {
                        if (abs.getPage() != page.getPageNumber()) {
                            continue;
                        }
-                        if (abs.getMaxY() > currentEnd) {
-                            currentEnd = abs.getMaxY();
+
+                        if (abs.getMinX() < abs.getMaxX()) {
+                            if (xMin == null || abs.getMinX() < xMin) {
+                                xMin = abs.getMinX();
+                            }
+                            if (xMax == null || abs.getMaxX() > xMax) {
+                                xMax = abs.getMaxX();
+                            }
+                        } else {
+                            if (xMin == null || abs.getMaxX() < xMin) {
+                                xMin = abs.getMaxX();
+                            }
+                            if (xMax == null || abs.getMinX() > xMax) {
+                                xMax = abs.getMinX();
+                            }
                        }
+
+                        if (abs.getMinY() < abs.getMaxY()) {
+                            if (yMin == null || abs.getMinY() < yMin) {
+                                yMin = abs.getMinY();
+                            }
+                            if (yMax == null || abs.getMaxY() > yMax) {
+                                yMax = abs.getMaxY();
+                            }
+                        } else {
+                            if (yMin == null || abs.getMaxY() < yMin) {
+                                yMin = abs.getMaxY();
+                            }
+                            if (yMax == null || abs.getMinY() > yMax) {
+                                yMax = abs.getMinY();
+                            }
+                        }
+
                    }

-                    if (image.getPosition().getY() >= perviousEnd && image.getPosition().getY() <= currentEnd) {
+                    log.debug("Image position x: {}, y: {}", image.getPosition().getX(), image.getPosition().getY());
+                    log.debug("Paragraph position xMin: {}, xMax: {}, yMin: {}, yMax: {}", xMin, xMax, yMin, yMax);
+
+                    if (xMin != null && xMax != null && yMin != null && yMax != null && image.getPosition().getX() >= xMin && image.getPosition()
+                            .getX() <= xMax && image.getPosition().getY() >= yMin && image.getPosition().getY() <= yMax) {
                        paragraph.getImages().add(image);
                        image.setAppendedToParagraph(true);
                    }
-                    perviousEnd = currentEnd;
                }
                if (!image.isAppendedToParagraph()) {
-                    paragraphsOnPage.first().getImages().add(image);
+                    log.debug("Image uses first paragraph");
+                    paragraphsOnPage.get(0).getImages().add(image);
                    image.setAppendedToParagraph(true);
                }
            }
@@ -166,9 +218,7 @@ public class SectionsBuilderService {
            List<Cell> previousTableNonHeaderRow = getRowWithNonHeaderCells(previousTable);
            List<Cell> tableNonHeaderRow = getRowWithNonHeaderCells(currentTable);
            // Allow merging of tables if header row is separated from first logical non-header row
-            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows()
-                    .get(0)
-                    .size() == tableNonHeaderRow.size()) {
+            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows().get(0).size() == tableNonHeaderRow.size()) {
                previousTableNonHeaderRow = previousTable.getRows().get(0).stream().map(cell -> {
                    Cell fakeCell = new Cell(cell.getPoints()[0], cell.getPoints()[2]);
                    fakeCell.setHeaderCells(Collections.singletonList(cell));
@@ -178,8 +228,7 @@ public class SectionsBuilderService {
            if (previousTableNonHeaderRow.size() == tableNonHeaderRow.size()) {
                for (int i = currentTable.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
                    List<Cell> row = currentTable.getRows().get(i);
-                    if (row.size() == tableNonHeaderRow.size() && row.stream()
-                            .allMatch(cell -> cell.getHeaderCells().isEmpty())) {
+                    if (row.size() == tableNonHeaderRow.size() && row.stream().allMatch(cell -> cell.getHeaderCells().isEmpty())) {
                        for (int j = 0; j < row.size(); j++) {
                            row.get(j).setHeaderCells(previousTableNonHeaderRow.get(j).getHeaderCells());
                        }
@@ -229,24 +278,20 @@ public class SectionsBuilderService {
            TextBlock wordBlock = (TextBlock) container;

            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
            } else if (splitByTable) {
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
                alreadyAdded = false;
            } else if (pageBefore != -1 && wordBlock.getPage() != pageBefore) {
                textBlock.setPage(pageBefore);
                paragraph.getPageBlocks().add(textBlock);
-                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock
-                        .getSequences(), wordBlock.getRotation());
+                textBlock = new TextBlock(wordBlock.getMinX(), wordBlock.getMaxX(), wordBlock.getMinY(), wordBlock.getMaxY(), wordBlock.getSequences(), wordBlock.getRotation());
                textBlock.setPage(wordBlock.getPage());
            } else {
                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
-                        .getHeight());
+                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
            }
            pageBefore = wordBlock.getPage();
            splitByTable = false;
@@ -268,11 +313,7 @@ public class SectionsBuilderService {

    private boolean hasInvalidHeaderInformation(Table table) {

-        return table.getRows()
-                .stream()
-                .flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
-                .findAny()
-                .isEmpty();
+        return table.getRows().stream().flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells()))).findAny().isEmpty();

    }

@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.storage;

 import com.dslplatform.json.DslJson;
 import com.dslplatform.json.runtime.Settings;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
@@ -28,6 +29,7 @@ import java.io.InputStream;
 public class RedactionStorageService {

    private final StorageService storageService;
+    private final ObjectMapper objectMapper;

    private final DslJson<Object> dslJson = new DslJson<>(Settings.basicSetup());

@@ -42,7 +44,15 @@ public class RedactionStorageService {
    @SneakyThrows
    public void storeObject(String dossierId, String fileId, FileType fileType, Object any) {
        var baos = new ByteArrayOutputStream();
-        dslJson.serialize(any, baos);
+        try {
+            dslJson.serialize(any, baos);
+        } catch (com.dslplatform.json.SerializationException e){
+            // Fails on file 49 Cyprodinil - EU AIR3 - MCA Section 8 Supplement - Ecotoxicological studies on the active substance.pdf
+            var bytes = objectMapper.writeValueAsBytes(any);
+            storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), bytes);
+            dslJson.newWriter();
+            return;
+        }
        storageService.storeObject(StorageIdUtils.getStorageId(dossierId, fileId, fileType), baos.toByteArray());
    }

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

 import com.amazonaws.services.s3.AmazonS3;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
@@ -29,7 +30,9 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
+
 import lombok.SneakyThrows;
+
 import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -58,6 +61,7 @@ import java.io.*;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;

@@ -214,16 +218,16 @@ public class RedactionIntegrationTest {
    }


-    private void mockDictionaryCalls(Long version){
+    private void mockDictionaryCalls(Long version) {

        when(dictionaryClient.getDictionaryForType(VERTEBRATE + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(VERTEBRATE, false));
        when(dictionaryClient.getDictionaryForType(ADDRESS + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(ADDRESS, false));
        when(dictionaryClient.getDictionaryForType(AUTHOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(AUTHOR, false));
-        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(SPONSOR, false));
+        when(dictionaryClient.getDictionaryForType(SPONSOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(SPONSOR, false));
        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR, false));
        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR, false));
        when(dictionaryClient.getDictionaryForType(HINT_ONLY + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(HINT_ONLY, false));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID,version)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(MUST_REDACT, false));
        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION, false));
        when(dictionaryClient.getDictionaryForType(TEST_METHOD + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(TEST_METHOD, false));
        when(dictionaryClient.getDictionaryForType(PII + ":" + TEST_DOSSIER_TEMPLATE_ID, version)).thenReturn(getDictionaryResponse(PII, false));
@@ -238,6 +242,7 @@ public class RedactionIntegrationTest {

    }

+
    @Test
    public void test270Rotated() {

@@ -491,14 +496,12 @@ public class RedactionIntegrationTest {
        deleted.add("David Chubb");
        deleted.add("mouse");

-
        reanlysisVersions.put("mouse", 3L);

        when(dictionaryClient.getVersion(TEST_DOSSIER_TEMPLATE_ID)).thenReturn(3L);

        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

-
        start = System.currentTimeMillis();

        ManualRedactions manualRedactions = new ManualRedactions();
@@ -669,7 +672,6 @@ public class RedactionIntegrationTest {

        when(dictionaryClient.getDictionaryForType(VERTEBRATE, null)).thenReturn(getDictionaryResponse(VERTEBRATE, false));

-
        start = System.currentTimeMillis();

        ManualRedactions manualRedactions = new ManualRedactions();
@@ -715,6 +717,71 @@ public class RedactionIntegrationTest {
    }


+    @Test
+    public void testRemovePublishedInformations() throws IOException {
+
+        long start = System.currentTimeMillis();
+
+        ClassPathResource colorsResource = new ClassPathResource("colors/colors.json");
+        var colors = objectMapper.readValue(colorsResource.getInputStream(), Colors.class);
+
+        ClassPathResource typeResource = new ClassPathResource("colors/types.json");
+        TypeReference<List<Type>> typeRefForTypes = new TypeReference<>() {
+        };
+        List<Type> types = objectMapper.readValue(typeResource.getInputStream(), typeRefForTypes);
+
+        AnalyzeRequest request = prepareStorage("files/new/PublishedInformationTest.pdf");
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        ManualRedactions manualRedactions = new ManualRedactions();
+        manualRedactions.getIdsToRemove()
+                .add(IdRemoval.builder()
+                        .annotationId("308dab9015bfafd911568cffe0a7f7de")
+                        .fileId(TEST_FILE_ID)
+                        .status(AnnotationStatus.APPROVED)
+                        .requestDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 07, 475479, ZoneOffset.UTC))
+                        .processedDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 07, 483651, ZoneOffset.UTC))
+                        .build());
+
+        manualRedactions.getForceRedactions()
+                .add(ManualForceRedaction.builder()
+                        .annotationId("0b56ea1a87c83f351df177315af94f0d")
+                        .fileId(TEST_FILE_ID)
+                        .status(AnnotationStatus.APPROVED)
+                        .requestDate(OffsetDateTime.of(2022, 05, 23, 9, 30, 15, 4653, ZoneOffset.UTC))
+                        .processedDate(OffsetDateTime.of(2022, 05, 23, 9, 30, 15, 794, ZoneOffset.UTC))
+                        .build());
+
+        manualRedactions.getIdsToRemove()
+                .add(IdRemoval.builder()
+                        .annotationId("0b56ea1a87c83f351df177315af94f0d")
+                        .fileId(TEST_FILE_ID)
+                        .status(AnnotationStatus.APPROVED)
+                        .requestDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 23, 961721, ZoneOffset.UTC))
+                        .processedDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 23, 96528, ZoneOffset.UTC))
+                        .build());
+
+        request.setManualRedactions(manualRedactions);
+
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+                .manualRedactions(manualRedactions)
+                .colors(colors)
+                .types(types)
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
    @Test
    public void testTableRedaction() throws IOException {

@@ -740,6 +807,61 @@ public class RedactionIntegrationTest {
    }


+    @Test
+    public void testFindDictionaryEntryInResizedEntryPosition() throws IOException {
+
+        System.out.println("testResizeDictFound");
+
+        ClassPathResource colorsResource = new ClassPathResource("colors/colors.json");
+        var colors = objectMapper.readValue(colorsResource.getInputStream(), Colors.class);
+
+        ClassPathResource typeResource = new ClassPathResource("colors/types.json");
+        TypeReference<List<Type>> typeRefForTypes = new TypeReference<>() {
+        };
+        List<Type> types = objectMapper.readValue(typeResource.getInputStream(), typeRefForTypes);
+
+        long start = System.currentTimeMillis();
+
+        AnalyzeRequest request = prepareStorage("files/new/ResizeRedactionTestDoc.pdf");
+
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        manualRedactions.getResizeRedactions()
+                .add(ManualResizeRedaction.builder()
+                        .annotationId("fd5ee82900beb7383f00480dea417569")
+                        .fileId(TEST_FILE_ID)
+                        .status(AnnotationStatus.APPROVED)
+                        .requestDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 07, 475479, ZoneOffset.UTC))
+                        .processedDate(OffsetDateTime.of(2022, 05, 23, 8, 30, 07, 483651, ZoneOffset.UTC))
+                        .value("Regina")
+                        .positions(List.of(new Rectangle(147.86f, 225.9895f, 31.17696f, 10.048125f, 1)))
+                        .textBefore("Switzerland Contact point: ")
+                        .textAfter(" Dorn Phone:")
+                        .build());
+
+        request.setManualRedactions(manualRedactions);
+
+        analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(request.getDossierId(), request.getFileId()));
+        AnalyzeResult result = analyzeService.analyze(request);
+
+        AnnotateResponse annotateResponse = annotationService.annotate(AnnotateRequest.builder()
+                        .manualRedactions(manualRedactions)
+                        .colors(colors)
+                        .types(types)
+                .dossierId(TEST_DOSSIER_ID)
+                .fileId(TEST_FILE_ID)
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream(OsUtils.getTemporaryDirectory() + "/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
    @Test
    public void testManualRedaction() throws IOException {

@@ -1539,15 +1661,16 @@ public class RedactionIntegrationTest {
        }
    }

+
    @Test
    public void testExpandByPrefixRegEx() throws IOException {

        assertThat(dictionary.get(AUTHOR).contains("Robinson"));
-        assertThat(! dictionary.get(AUTHOR).contains("Mrs. Robinson"));
+        assertThat(!dictionary.get(AUTHOR).contains("Mrs. Robinson"));
        assertThat(dictionary.get(AUTHOR).contains("Bojangles"));
-        assertThat(! dictionary.get(AUTHOR).contains("Mr. Bojangles"));
+        assertThat(!dictionary.get(AUTHOR).contains("Mr. Bojangles"));
        assertThat(dictionary.get(AUTHOR).contains("Tambourine Man"));
-        assertThat(! dictionary.get(AUTHOR).contains("Mr. Tambourine Man"));
+        assertThat(!dictionary.get(AUTHOR).contains("Mr. Tambourine Man"));

        String fileName = "files/mr-mrs.pdf";
        String outputFileName = OsUtils.getTemporaryDirectory() + "/Annotated.pdf";
@@ -1578,6 +1701,7 @@ public class RedactionIntegrationTest {
        assertThat(values).contains("Mr. Tambourine Man");
    }

+
    @SneakyThrows
    private AnalyzeRequest prepareStorage(InputStream stream) {

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

+import java.util.List;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -17,4 +21,6 @@ public class AnnotateRequest {
    private String dossierTemplateId;
    private String fileId;
    private ManualRedactions manualRedactions;
+    private Colors colors;
+    private List<Type> types;
 }
@@ -46,6 +46,8 @@ public class AnnotationService {
                .manualRedactions(annotateRequest.getManualRedactions())
                .dossierId(annotateRequest.getDossierId())
                .dossierTemplateId(annotateRequest.getDossierTemplateId())
+                        .colors(annotateRequest.getColors())
+                        .types(annotateRequest.getTypes())
                .build());
        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());

@@ -0,0 +1,13 @@
+{
+  "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+  "defaultColor": "#9398a0",
+  "requestAdd": "#04b093",
+  "requestRemove": "#04b093",
+  "notRedacted": "#c498fa",
+  "analysisColor": "#dd4d50",
+  "updatedColor": "#fdbd00",
+  "dictionaryRequestColor": "#5b97db",
+  "manualRedactionColor": "#9398a0",
+  "previewColor": "#9398a0",
+  "ignoredHintColor": "#e7d4ff"
+}
@@ -0,0 +1,223 @@
+[
+  {
+    "id": "CBI_address:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "CBI_address",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 140,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "All site names and addresses, and location (e.g. Syngenta, Monthey, GPS Co-ordinates, Mr Smith of … providing the…). Except addresses in published literature and the applicant address.",
+    "addToDictionaryAction": true,
+    "label": "CBI Address",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "CBI_author:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "CBI_author",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 130,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "All authors named in the study documentation. Except names in published literature.",
+    "addToDictionaryAction": true,
+    "label": "CBI Author",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "PII:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "PII",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 150,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "Not authors but listed in the document: Names, signatures, telephone, email etc.; e.g. Reg Manager, QA Manager",
+    "addToDictionaryAction": true,
+    "label": "PII",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "formula:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "formula",
+    "hexColor": "#036ffc",
+    "recommendationHexColor": "#8df06c",
+    "rank": 1002,
+    "isHint": true,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Empty dictionary used to configure formula colors.",
+    "addToDictionaryAction": false,
+    "label": "Formula",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "isHint_only:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "isHint_only",
+    "hexColor": "#fa98f7",
+    "recommendationHexColor": "#8df06c",
+    "rank": 50,
+    "isHint": true,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Entries of this dictionary will be highlighted only",
+    "addToDictionaryAction": false,
+    "label": "isHint Only",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "image:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "image",
+    "hexColor": "#bdd6ff",
+    "recommendationHexColor": "#8df06c",
+    "rank": 999,
+    "isHint": true,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Empty dictionary used to configure image colors.",
+    "addToDictionaryAction": false,
+    "label": "Image",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "logo:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "logo",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 1001,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Empty dictionary used to configure logo colors.",
+    "addToDictionaryAction": false,
+    "label": "Logo",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "must_redact:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "must_redact",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 100,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Entries of this dictionary get redacted wherever found.",
+    "addToDictionaryAction": false,
+    "label": "Must Redact",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "ocr:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "ocr",
+    "hexColor": "#bdd6ff",
+    "recommendationHexColor": "#8df06c",
+    "rank": 1000,
+    "isHint": true,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Empty dictionary used to configure ocr colors.",
+    "addToDictionaryAction": false,
+    "label": "Ocr",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "signature:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "signature",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 1003,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": true,
+    "isRecommendation": false,
+    "description": "Empty dictionary used to configure signature colors.",
+    "addToDictionaryAction": false,
+    "label": "Signature",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "imported_redaction:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "imported_redaction",
+    "hexColor": "#f0f0c0",
+    "recommendationHexColor": "#8df06c",
+    "rank": 9999,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "Redaction Annotations that were imported from documents",
+    "addToDictionaryAction": false,
+    "label": "Imported Redaction",
+    "hasDictionary": false,
+    "systemManaged": true,
+    "autoHideSkipped": true
+  },
+  {
+    "id": "published_information:31039447-9040-4376-9ca7-614e56b284b9",
+    "type": "published_information",
+    "hexColor": "#85ebff",
+    "recommendationHexColor": "#8df06c",
+    "rank": 70,
+    "isHint": true,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "Manual managed list of public journals and papers that need no redaction",
+    "addToDictionaryAction": true,
+    "label": "Published Information",
+    "hasDictionary": true,
+    "systemManaged": false,
+    "autoHideSkipped": false
+  },
+  {
+    "id": "dossier_redaction:31039447-9040-4376-9ca7-614e56b284b9:5dfb2724-74a4-4a1a-a1eb-165e7943ffcd",
+    "type": "dossier_redaction",
+    "hexColor": "#9398a0",
+    "recommendationHexColor": null,
+    "rank": 1500,
+    "isHint": false,
+    "dossierTemplateId": "31039447-9040-4376-9ca7-614e56b284b9",
+    "isCaseInsensitive": false,
+    "isRecommendation": false,
+    "description": "Entries in this dictionary will only be redacted in this dossier",
+    "addToDictionaryAction": false,
+    "label": "Dossier Redaction",
+    "hasDictionary": true,
+    "systemManaged": true,
+    "autoHideSkipped": false
+  }
+]
@@ -9,3 +9,4 @@ Naka-27 Aomachi, Nomi, Ishikawa 923-1101, Japan, JP
 Özgür U. Reyhan
 Sude Halide Nurullah
 Xinyi Y. Tao
+Dorn
@@ -86,3 +86,4 @@ Toxicol Sci
 Toxicol Sci.
 Toxicol Sci. 1
 Test Ignored Hint Published Information
+Workshop
Author	SHA1	Message	Date
deiflaender	4c9cb10a61	RED-4064: Fixed find dictionary entries at position where rules entries are resized to smaller entries	2022-06-02 10:32:48 +02:00
Philipp Schramm	50b2908763	Pull request #395 : RED-3816: Bugfix with adding images to sections Merge in RED/redaction-service from bugfix/RED-3816 to master * commit 'c1192ceefd0717958badc27d2c2a65a8059952a4': RED-3816: Bugfix with adding images to sections	2022-05-30 14:43:35 +02:00
Philipp Schramm	c1192ceefd	RED-3816: Bugfix with adding images to sections	2022-05-30 13:52:57 +02:00
Timo Bejan	77584c9a5a	Pull request #394 : RED-3800 String Performance matching test Merge in RED/redaction-service from RED-3800-string-performance-test to master * commit '21d717f0837c9cc9b2f5b251d372db88b25a7b6d': RED-3800 String Performance matching test RED-3800 String Performance matching test	2022-05-24 11:09:08 +02:00
Philipp Schramm	f608d991a3	Pull request #393 : RED-3816: Implemented ThenAction to redact section with rectangle Merge in RED/redaction-service from RED-3816 to master * commit 'eb7137315208dadf3a679e21b05ec16d53c4ec43': RED-3816: Implemented ThenAction to redact section with rectangle	2022-05-24 09:00:07 +02:00
Ali Oezyetimoglu	e914b09d1e	Pull request #392 : RED-3674: Fixed force redactions overrides idRemoval with different id Merge in RED/redaction-service from RED-3674-rs1 to master * commit '87d64b6d1285eaf7cd5ee3c2fb899f92063bc70f': RED-3674: Fixed force redactions overrides idRemoval with different id	2022-05-23 18:48:10 +02:00
aoezyetimoglu	87d64b6d12	RED-3674: Fixed force redactions overrides idRemoval with different id	2022-05-23 17:38:23 +02:00
Philipp Schramm	eb71373152	Merge branch 'master' into RED-3816	2022-05-23 16:27:12 +02:00
Philipp Schramm	a65e23e45d	RED-3816: Implemented ThenAction to redact section with rectangle	2022-05-23 16:26:47 +02:00
Dominique Eiflaender	4aaef260d7	Pull request #390 : RED-4075: Add legalBasis if Rule Entity overrides Ai Recommendation Merge in RED/redaction-service from RED-4075 to master * commit 'c669f9a09a3e5e254d41715f65fef3b158873338': RED-4075: Add legalBasis if Rule Entity overrides Ai Recommendation	2022-05-23 14:05:38 +02:00
deiflaender	c669f9a09a	RED-4075: Add legalBasis if Rule Entity overrides Ai Recommendation	2022-05-23 13:54:27 +02:00
deiflaender	b1bad03090	RED-4014: Changed metrics config	2022-05-12 16:08:54 +02:00
deiflaender	0a0d9fe31a	RED-4014: Added names to @Timed annotations	2022-05-12 15:56:03 +02:00
deiflaender	fd37e3deab	RED-4014: Added @Timed annotations to AnaylseService	2022-05-12 15:10:35 +02:00
Dominique Eiflaender	7fb04cfa48	Pull request #389 : RED-4010: Fixed problem with strange unicode in json d835 Merge in RED/redaction-service from RED-4010 to master * commit '0f5f7974cc46e36d39d514ad03b5adcf062c9526': RED-4010: Fixed problem with strange unicode in json d835	2022-05-11 14:41:07 +02:00
deiflaender	0f5f7974cc	RED-4010: Fixed problem with strange unicode in json d835	2022-05-11 14:38:06 +02:00
Dominique Eiflaender	0601ec4862	Pull request #388 : RED-4009: Fixed NPE if comments are null in RedactionLogMergeService Merge in RED/redaction-service from RED-4009 to master * commit 'd2807e0ff1ef288c7456383974a8607a8fca4821': RED-4009: Fixed NPE if comments are null in RedactionLogMergeService	2022-05-10 13:24:23 +02:00
deiflaender	d2807e0ff1	RED-4009: Fixed NPE if comments are null in RedactionLogMergeService	2022-05-10 13:20:57 +02:00
Timo Bejan	e49bbfca88	Pull request #387 : RED-3800 switched jackson for dsl-json for internal non-rest related operations Merge in RED/redaction-service from RED-3800-dsljson to master * commit '7967453c676094efdc438eea1cca2b9e00856c0d': RED-3800 api cleanup RED-3800 api cleanup RED-3800 switched jackson for dsl-json for internal non-rest related operations	2022-05-09 21:14:04 +02:00
Timo Bejan	78de7371a0	Pull request #385 : RED-3946 - quotation-mark fix Merge in RED/redaction-service from RED-3946-qf to master * commit 'df2fcd2e5e48298131ebf7a00bf2ed80a9fc2d96': RED-3946 - quotation-mark fix	2022-05-09 14:47:03 +02:00
Dominique Eiflaender	924f791e4d	Pull request #386 : RED-3959: Do not remove entities on larger false_recommendactions Merge in RED/redaction-service from RED-3959 to master * commit '542bbb294a27bf2eb2832a144d239b820bbc0b5f': RED-3959: Do not remove entities on larger false_recommendactions	2022-05-09 12:34:13 +02:00
deiflaender	542bbb294a	RED-3959: Do not remove entities on larger false_recommendactions	2022-05-09 12:27:36 +02:00
Timo Bejan	8e819a0d26	Pull request #384 : RED-3992 Merge in RED/redaction-service from RED-3992 to master * commit '01e7115d301d8706962390b76af0769eab67c1fe': RED-3992 - Fixed PMD RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations RED-3992 - Replaced naive approach with aho corassick string search. Cleaned up code. reduced ammount of unnecesary conversions/invocations RED-3800 Exception handling for processed files	2022-05-09 10:05:50 +02:00