Fixed 'Comparison method violates its general contract' by using QuickSort from PDFBox

Pull request #83 : RED-882: Added textBefore and textAfter to redaction log
Merge in RED/redaction-service from RED-882 to master * commit 'caf6277de9e0d175d3ff11c1e7819cfbc37f3539': RED-882: Added textBefore and textAfter to redaction log
2020-12-22 16:04:29 +01:00 · 2020-12-18 14:41:23 +01:00 · 2020-12-18 14:31:27 +01:00 · 2020-12-11 11:39:00 +01:00 · 2020-12-11 11:26:48 +01:00 · 2020-12-10 19:33:58 +01:00
37 changed files with 1021 additions and 336 deletions
@@ -51,7 +51,7 @@ public class PlanSpec {
    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
        Permissions permission = new Permissions()
                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("gin4", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -134,4 +134,4 @@ public class PlanSpec {
                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
-}
+}
@@ -22,6 +22,7 @@ public class RedactionLogEntry {
    private String legalBasis;
    private boolean redacted;
    private boolean isHint;
+    private boolean isRecommendation;
    private String section;
    private float[] color;

@@ -31,5 +32,9 @@ public class RedactionLogEntry {
    private boolean manual;
    private Status status;
    private ManualRedactionType manualRedactionType;
+    private boolean isDictionaryEntry;
+
+    private String textBefore;
+    private String textAfter;

 }
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.7</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -27,4 +27,6 @@ public class Document {

    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
+    private long dictionaryVersion;
+    private long rulesVersion;
 }
@@ -5,15 +5,17 @@ import java.util.regex.Pattern;

 import org.springframework.stereotype.Service;

-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
 public class ClassificationService {
@@ -28,7 +30,7 @@ public class ClassificationService {

        List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();

-        System.out.println(document.getFontSizeCounter().getCountPerValue());
+        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());

        for (Page page : document.getPages()) {
            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
@@ -39,6 +41,7 @@ public class ClassificationService {


    public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+
        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
            if (textBlock instanceof TextBlock) {
                classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
@@ -47,24 +50,33 @@ public class ClassificationService {
    }


-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
+                              List<Float> headlineFontSizes) {
+
        if (document.getFontSizeCounter().getMostPopular() == null) {
            // TODO Figure out why this happens.
            return;
        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
            textBlock.setClassification("Header");

-        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
            textBlock.setClassification("Footer");
-        }  else if (page.getPageNumber() == 1
-                && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock)
-                && PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks().size() == 1)) {
+        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
+                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
+                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
+                .getMostPopular() || page.getTextBlocks().size() == 1)) {
            if (!Pattern.matches("[0-9]+", textBlock.toString())) {
                textBlock.setClassification("Title");
            }
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter().getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -72,20 +84,34 @@ public class ClassificationService {
                    document.setHeadlines(true);
                }
            }
-        }else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
+                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
            textBlock.setClassification("TextBlock Bold");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont().equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle().equals(document.getFontStyleCounter().getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular()) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
+                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
+                .equals(document.getFontStyleCounter()
+                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular()) {
            textBlock.setClassification("TextBlock");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("italic") && !document.getFontStyleCounter().getMostPopular().equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("italic") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("TextBlock Italic");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)){
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
            textBlock.setClassification("TextBlock Unknown");
        }
    }
+
 }
@@ -18,18 +18,18 @@ import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.AnnotationHighlightService;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfFlattenService;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@RestController
@RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
@@ -38,9 +38,7 @@ public class RedactionController implements RedactionResource {
    private final PdfSegmentationService pdfSegmentationService;
    private final AnnotationHighlightService annotationHighlightService;
    private final EntityRedactionService entityRedactionService;
-    private final PdfFlattenService pdfFlattenService;
    private final DroolsExecutionService droolsExecutionService;
-    private final DictionaryService dictionaryService;


    @Override
@@ -50,18 +48,17 @@ public class RedactionController implements RedactionResource {
            pdDocument.setAllSecurityToBeRemoved(true);

            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+
+            log.info("Document structure analysis successful, starting redaction analysis...");
+
            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
                    .getManualRedactions());

-            if (redactionRequest.isFlatRedaction()) {
-                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
-                return convert(flatDocument, classifiedDoc.getPages()
-                        .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid());
-            }
+            log.info("Redaction analysis successful...");

            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid());
+                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -142,21 +139,20 @@ public class RedactionController implements RedactionResource {

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

-        return convert(document, numberOfPages, null, null);
+        return convert(document, numberOfPages, null, null, 0, 0);
    }


    private RedactionResult convert(PDDocument document, int numberOfPages,
                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid) throws IOException {
+                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryService.getDictionaryVersion(), droolsExecutionService
-                            .getRulesVersion()))
+                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
                    .sectionGrid(sectionGrid)
                    .build();
        }
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import java.util.Iterator;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
@@ -9,9 +12,9 @@ import lombok.Value;
@Value
 public class CellValue {

-    TextBlock textBlock;
+    private List<TextBlock> textBlocks;

-    int rowSpanStart;
+    private int rowSpanStart;


    @Override
@@ -19,17 +22,24 @@ public class CellValue {

        StringBuilder sb = new StringBuilder();

-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : textBlock.getSequences()) {
-            if (previous != null) {
-                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        while (itty.hasNext()) {
+            TextBlock textBlock = itty.next();
+            TextPositionSequence previous = null;
+            for (TextPositionSequence word : textBlock.getSequences()) {
+                if (previous != null) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
                }
+                sb.append(word.toString());
+                previous = word;
+            }
+            if (itty.hasNext()) {
+                sb.append(' ');
            }
-            sb.append(word.toString());
-            previous = word;
        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+public class Dictionary {
+
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+    @Getter
+    private long version;
+
+
+    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+        this.dictionaryModels = dictionaryModels;
+        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
+        this.version = dictionaryVersion;
+    }
+
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public boolean hasLocalEntries() {
+
+        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
+    }
+
+
+    public Set<String> getTypes() {
+
+        return localAccessMap.keySet();
+    }
+
+
+    public boolean containsValue(String type, String value) {
+
+        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getLocalEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getLocalEntries()
+                .contains(value)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+}
@@ -0,0 +1,27 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+
+import java.io.Serializable;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryModel implements Serializable {
+
+    private String type;
+    private int rank;
+    private float[] color;
+    private boolean caseInsensitive;
+    private boolean hint;
+    private boolean recommendation;
+    private Set<String> entries;
+    private Set<String> localEntries;
+
+    public Set<String> getValues(boolean local){
+        return local ? localEntries : entries;
+    }
+
+}
@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity {

-    @EqualsAndHashCode.Include
+
    private final String word;
    private final String type;
    private boolean redaction;
@@ -20,7 +20,10 @@ public class Entity {
    private String legalBasis;
    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
    private List<TextPositionSequence> targetSequences;
+
+    @EqualsAndHashCode.Include
    private Integer start;
+    @EqualsAndHashCode.Include
    private Integer end;

    @EqualsAndHashCode.Include
@@ -30,8 +33,13 @@ public class Entity {
    @EqualsAndHashCode.Include
    private int sectionNumber;

+    private boolean isDictionaryEntry;

-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis) {
+    private String textBefore;
+    private String textAfter;
+
+
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter) {

        this.word = word;
        this.type = type;
@@ -42,10 +50,13 @@ public class Entity {
        this.matchedRule = matchedRule;
        this.sectionNumber = sectionNumber;
        this.legalBasis = legalBasis;
+        this.isDictionaryEntry = isDictionaryEntry;
+        this.textBefore = textBefore;
+        this.textAfter = textAfter;
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {

        this.word = word;
        this.type = type;
@@ -53,6 +64,7 @@ public class Entity {
        this.end = end;
        this.headline = headline;
        this.sectionNumber = sectionNumber;
+        this.isDictionaryEntry = isDictionaryEntry;
    }

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

+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 import org.apache.commons.lang3.StringUtils;

-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;

 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +24,12 @@ import lombok.extern.slf4j.Slf4j;
@Builder
 public class Section {

-    private DictionaryService dictionaryService;
+    private boolean isLocal;
+
+    private Set<String> dictionaryTypes;
+
+    @Builder.Default
+    private Map<String, Set<String>> localDictionaryAdds = new HashMap<>();

    private Set<Entity> entities;

@@ -42,8 +51,7 @@ public class Section {
        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

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

@@ -62,8 +70,11 @@ public class Section {

    public void redact(String type, int ruleNumber, String reason, String legalBasis) {

+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -75,8 +86,11 @@ public class Section {

    public void redactNot(String type, int ruleNumber, String reason) {

+        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -146,8 +160,8 @@ public class Section {
                    // HashSet keeps the older value, but we want the new only.
                    entities.removeAll(found);
                    entities.addAll(found);
-                    if (redactEverywhere) {
-                        dictionaryService.addToLocalDictionary(asType, value.trim());
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
                    }
                }
            }
@@ -174,14 +188,20 @@ public class Section {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
                    String[] lines = value.split("\n");
+
                    for (String line : lines) {
+
+                        if (line.trim().length() <= 2) {
+                            return;
+                        }
+
                        Set<Entity> found = findEntities(line.trim(), asType, false);

                        // HashSet keeps the older value, but we want the new only.
                        entities.removeAll(found);
                        entities.addAll(found);
-                        if (redactEverywhere) {
-                            dictionaryService.addToLocalDictionary(asType, line.trim());
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
                        }
                    }
                }
@@ -202,6 +222,10 @@ public class Section {

    private Set<Entity> findEntities(String value, String asType, boolean caseinsensitive) {

+        if (value.trim().length() <= 2) {
+            return new HashSet<>();
+        }
+
        Set<Entity> found = new HashSet<>();

        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
@@ -215,7 +239,7 @@ public class Section {

            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(text.charAt(startIndex - 1)) || isSeparator(text
                    .charAt(startIndex - 1))) && (stopIndex == text.length() || isSeparator(text.charAt(stopIndex)))) {
-                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber));
+                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber, false));
            }
        } while (startIndex > -1);

@@ -247,24 +271,26 @@ public class Section {

    public void highlightCell(String cellHeader, int ruleNumber, String type) {

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


-    public void redactCell(String cellHeader, int ruleNumber, String type, String reason, String legalBasis) {
+    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
+                           String legalBasis) {

-        annotateCell(cellHeader, ruleNumber, type, true, reason, legalBasis);
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
    }


-    public void redactNotCell(String cellHeader, int ruleNumber, String type, String reason) {
+    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
+                              String reason) {

-        annotateCell(cellHeader, ruleNumber, type, false, reason, null);
+        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
    }


-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, 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("-", "");

@@ -273,11 +299,13 @@ public class Section {
            log.warn("Could not find any data for {}.", cellHeader);
        } else {
            String word = value.toString();
-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber);
+
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
-            entity.setTargetSequences(value.getTextBlock()
+            entity.setTargetSequences(value.getTextBlocks()
+                    .get(0)
                    .getSequences()); // Make sure no other cells with same content are highlighted
            entity.setLegalBasis(legalBasis);

@@ -286,7 +314,30 @@ public class Section {
            entities.add(entity);

            entities = removeEntitiesContainedInLarger(entities);
+
+            if (addAsRecommendations && !isLocal()) {
+                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
+                Pattern pattern = Patterns.AUTHOR_TABLE_SPITTER;
+                Matcher matcher = pattern.matcher(cleanedWord);
+
+                while (matcher.find()) {
+                    String match = matcher.group().trim();
+                    if (match.length() >= 3) {
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(match);
+                        String lastname = match.split(" ")[0];
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
+                                .add(lastname);
+                    }
+                }
+            }
        }
    }

 }
+
+
+
+
+
+
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SectionSearchableTextPair {
+
+    private Section section;
+    private SearchableText searchableText;
+
+}
@@ -8,16 +8,18 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.stream.Collectors;

 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;

 import com.iqser.red.service.configuration.v1.api.model.Colors;
 import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
 import com.iqser.red.service.configuration.v1.api.model.TypeResult;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;

 import feign.FeignException;
 import lombok.Getter;
@@ -29,25 +31,14 @@ import lombok.extern.slf4j.Slf4j;
@RequiredArgsConstructor
 public class DictionaryService {

+
    private final DictionaryClient dictionaryClient;

    @Getter
    private long dictionaryVersion = -1;

    @Getter
-    private Map<String, Set<String>> dictionary = new TreeMap<>(Comparator.reverseOrder()); // Using TreeMap, because order of keys is important.
-
-    @Getter
-    private Map<String, Set<String>> localDictionary = new TreeMap<>(Comparator.reverseOrder()); // Using TreeMap, because order of keys is important.
-
-    @Getter
-    private Map<String, float[]> entryColors = new HashMap<>();
-
-    @Getter
-    private List<String> hintTypes = new ArrayList<>();
-
-    @Getter
-    private List<String> caseInsensitiveTypes = new ArrayList<>();
+    private List<DictionaryModel> dictionary = new ArrayList<>();

    @Getter
    private float[] defaultColor;
@@ -62,16 +53,8 @@ public class DictionaryService {
    private float[] notRedactedColor;


-    public void addToLocalDictionary(String type, String value) {
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();

-        localDictionary.computeIfAbsent(type, (x) -> new HashSet<>()).add(value);
-    }
-
-
-    public void clearLocalDictionary() {
-
-        localDictionary = new TreeMap<>(Comparator.reverseOrder());
-    }


    public void updateDictionary() {
@@ -89,24 +72,16 @@ public class DictionaryService {
        try {
            TypeResponse typeResponse = dictionaryClient.getAllTypes();
            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
-                entryColors = typeResponse.getTypes()
+
+                dictionary = typeResponse.getTypes()
                        .stream()
-                        .collect(Collectors.toMap(TypeResult::getType, t -> convertColor(t.getHexColor())));
-                hintTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isHint)
-                        .map(TypeResult::getType)
-                        .collect(Collectors.toList());
-                caseInsensitiveTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isCaseInsensitive)
-                        .map(TypeResult::getType)
+                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

-                dictionary = new TreeMap<>(Comparator.reverseOrder());
-                entryColors.keySet().forEach(type -> {
-                    dictionary.put(type, convertEntries(type));
-                });
+                localAccessMap.clear();
+                dictionary.forEach(dm -> localAccessMap.put(dm.getType(), dm));

                Colors colors = dictionaryClient.getColors();
                defaultColor = convertColor(colors.getDefaultColor());
@@ -121,16 +96,30 @@ public class DictionaryService {
    }


-    private Set<String> convertEntries(String s) {
+    public void updateExternalDictionary(Dictionary dictionary){
+        dictionary.getDictionaryModels().forEach(dm -> {
+            if(dm.isRecommendation() && !dm.getLocalEntries().isEmpty()){
+                dictionaryClient.addEntries(dm.getType(), new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion();
+                if(externalVersion == dictionary.getVersion() + 1){
+                    dictionary.setVersion(externalVersion);
+                }
+            }
+        });
+    }

-        if (caseInsensitiveTypes.contains(s)) {
-            return dictionaryClient.getDictionaryForType(s)
+
+    private Set<String> convertEntries(TypeResult t) {
+
+        if (t.isCaseInsensitive()) {
+            return dictionaryClient.getDictionaryForType(t.getType())
                    .getEntries()
                    .stream()
                    .map(String::toLowerCase)
                    .collect(Collectors.toSet());
+        } else {
+            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType()).getEntries());
        }
-        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
    }


@@ -140,4 +129,54 @@ public class DictionaryService {
        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
    }

+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+
+    public float[] getColor(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.getColor();
+        }
+        return defaultColor;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public Dictionary getDeepCopyDictionary(){
+        List<DictionaryModel> copy = new ArrayList<>();
+
+        dictionary.forEach(dm -> {
+            copy.add(SerializationUtils.clone(dm));
+        });
+
+        return new Dictionary(copy, dictionaryVersion);
+    }
+
 }
@@ -7,6 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -19,37 +21,55 @@ import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 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.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
 public class EntityRedactionService {

    private final DictionaryService dictionaryService;
    private final DroolsExecutionService droolsExecutionService;
+    private final SurroundingWordsService surroundingWordsService;


    public void processDocument(Document classifiedDoc, ManualRedactions manualRedactions) {

        dictionaryService.updateDictionary();
        droolsExecutionService.updateRules();
-        dictionaryService.clearLocalDictionary();
+        long rulesVersion = droolsExecutionService.getRulesVersion();

-        Set<Entity> documentEntities = new HashSet<>();
-        documentEntities.addAll(findEntities(classifiedDoc, manualRedactions, dictionaryService.getDictionary()));
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary();

-        if(!dictionaryService.getLocalDictionary().isEmpty()){
-            Set<Entity> foundByLocal = findEntities(classifiedDoc, manualRedactions, dictionaryService.getLocalDictionary());
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, manualRedactions, dictionary, false, null));
+
+        if (dictionary.hasLocalEntries()) {
+
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+            documentEntities.stream().forEach(entity -> {
+                if (dictionary.isHint(entity.getType())) {
+                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
+                            .add(entity);
+                }
+            });
+
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, manualRedactions, dictionary, true, hintsPerSectionNumber);
            // HashSet keeps the older value, but we want the new only.
            documentEntities.removeAll(foundByLocal);
            documentEntities.addAll(foundByLocal);
+
+            removeEntitiesContainedInLarger(documentEntities);
        }

        for (Entity entity : documentEntities) {
@@ -63,16 +83,24 @@ public class EntityRedactionService {
                classifiedDoc.getEntities()
                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis()));
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter()));
            }
        }

+        dictionaryService.updateExternalDictionary(dictionary);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
    }


-    private Set<Entity> findEntities(Document classifiedDoc, ManualRedactions manualRedactions, Map<String, Set<String>> dictionary){
+    private Set<Entity> findEntities(Document classifiedDoc, ManualRedactions manualRedactions, Dictionary dictionary,
+                                     boolean local, Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
        Set<Entity> documentEntities = new HashSet<>();
        int sectionNumber = 1;
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {

            SearchableText searchableText = paragraph.getSearchableText();
@@ -85,6 +113,7 @@ public class EntityRedactionService {
                    SearchableText searchableRow = new SearchableText();
                    Map<String, CellValue> tabularData = new HashMap<>();
                    int start = 0;
+                    List<Integer> cellStarts = new ArrayList<>();
                    for (Cell cell : row) {
                        if (!singleCellTable && cell.isHeaderCell() || CollectionUtils.isEmpty(cell.getTextBlocks())) {
                            continue;
@@ -98,58 +127,98 @@ public class EntityRedactionService {
                                    .replaceAll("\n", "")
                                    .replaceAll(" ", "")
                                    .replaceAll("-", "");
-                            tabularData.put(headerName, new CellValue(cell.getTextBlocks().get(0), cellStart));
+                            tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
                        });
-                        start = start + cell.toString().length() + 1; // include automatically appended white space
+
                        for (TextBlock textBlock : cell.getTextBlocks()) {
+                            // TODO avoid cell overlap merging.
                            searchableRow.addAll(textBlock.getSequences());
                        }
+                        cellStarts.add(cellStart);
+                        start = start + cell.toString().trim().length() + 1;
                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, dictionary);
+                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber, dictionary
+                            .getDictionaryModels(), local);
+                    surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);

-                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
-                            .dictionaryService(dictionaryService)
-                            .entities(rowEntities)
+                    sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                            .isLocal(local)
+                            .dictionaryTypes(dictionary.getTypes())
+                            .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
+                                    .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
+                                    .collect(Collectors.toSet()) : rowEntities)
                            .text(searchableRow.getAsStringWithLinebreaks())
                            .searchText(searchableRow.toString())
                            .headline(table.getHeadline())
                            .sectionNumber(sectionNumber)
                            .tabularData(tabularData)
-                            .build());
+                            .build(), searchableRow));

-                    documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), searchableRow));
                    sectionNumber++;
                }
                sectionNumber++;
            }

            addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber, dictionary);
-            Section analysedSection = droolsExecutionService.executeRules(Section.builder()
-                    .dictionaryService(dictionaryService)
-                    .entities(entities)
+            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);
+            surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(local)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
+                            .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
+                            .collect(Collectors.toSet()) : entities)
                    .text(searchableText.getAsStringWithLinebreaks())
                    .searchText(searchableText.toString())
                    .headline(paragraph.getHeadline())
                    .sectionNumber(sectionNumber)
-                    .build());
+                    .build(), searchableText));

-            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
            sectionNumber++;
        }
+
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedRowSection = droolsExecutionService.executeRules(sectionSearchableTextPair.getSection());
+            documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), sectionSearchableTextPair.getSearchableText(), dictionary));
+
+            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+                if (dictionary.isRecommendation(key)) {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                        if (!dictionary.containsValue(key, value)) {
+                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                        }
+                    });
+                } else {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                        if (dictionary.getLocalAccessMap().get(key) == null) {
+                            log.warn("Dictionary {} is null", key);
+                        }
+
+                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                            log.warn("Dictionary {} localEntries is null", key);
+                        }
+
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    });
+                }
+            });
+
+        });
+
        return documentEntities;
    }


-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text) {
+    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {

        removeEntitiesContainedInLarger(entities);

        for (Entity entity : entities) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entity.getType())) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), true, entity.getTargetSequences()));
-            } else {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), false, entity.getTargetSequences()));
+            if (entity.getPositionSequences().isEmpty()) {
+                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
+                        .getType()), entity.getTargetSequences()));
            }
        }

@@ -157,7 +226,8 @@ public class EntityRedactionService {
    }


-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber, Map<String, Set<String>> dictionary) {
+    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                     List<DictionaryModel> dictionary, boolean local) {

        Set<Entity> found = new HashSet<>();
        String searchableString = searchableText.toString();
@@ -166,25 +236,30 @@ public class EntityRedactionService {
        }

        String lowercaseInputString = searchableString.toLowerCase();
-        for (Map.Entry<String, Set<String>> entry : dictionary.entrySet()) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entry.getKey())) {
-                found.addAll(find(lowercaseInputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+        for (DictionaryModel model : dictionary) {
+            if (model.isCaseInsensitive()) {
+                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            } else {
-                found.addAll(find(searchableString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            }
        }
-
        removeEntitiesContainedInLarger(found);
-
        return found;

    }


-    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber) {
+    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
+                             boolean local) {

        Set<Entity> found = new HashSet<>();
+
        for (String value : values) {
+
+            if (value.trim().length() <= 2) {
+                continue;
+            }
+
            int startIndex;
            int stopIndex = 0;
            do {
@@ -193,7 +268,7 @@ public class EntityRedactionService {

                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local));
                }
            } while (startIndex > -1);
        }
@@ -213,7 +288,8 @@ public class EntityRedactionService {
        for (Entity word : entities) {
            for (Entity inner : entities) {
                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
                    wordsToRemove.add(inner);
                }
            }
@@ -222,7 +298,8 @@ public class EntityRedactionService {
    }


-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions, String section, int sectionNumber) {
+    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
+                                              String section, int sectionNumber) {

        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
            return;
@@ -0,0 +1,140 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SurroundingWordsService {
+
+    private final RedactionServiceSettings redactionServiceSettings;
+
+
+    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary) {
+
+        if (entities.isEmpty()) {
+            return;
+        }
+
+        try {
+            for (Entity entity : entities) {
+
+                if (dictionary.isHint(entity.getType())) {
+                    continue;
+                }
+                findSurroundingWords(entity, searchableText.toString(), entity.getStart(), entity.getEnd());
+            }
+        } catch (Exception e) {
+            log.warn("Could not get surrounding text!");
+        }
+    }
+
+
+    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary,
+                                   List<Integer> cellstarts) {
+
+        if (entities.isEmpty()) {
+            return;
+        }
+
+        try {
+            String searchableString = searchableText.toString();
+
+            if (cellstarts != null) {
+                for (int i = 0; i < cellstarts.size(); i++) {
+
+                    int startOffset = cellstarts.get(i);
+                    int endOffset = -1;
+
+                    if (i + 1 < cellstarts.size()) {
+                        endOffset = cellstarts.get(i + 1);
+                    } else {
+                        endOffset = searchableString.length() - 1;
+                    }
+
+                    String text = searchableString.substring(startOffset, endOffset);
+                    for (Entity entity : entities) {
+
+                        if (dictionary.isHint(entity.getType())) {
+                            continue;
+                        }
+
+                        if (entity.getStart() >= startOffset && entity.getEnd() <= endOffset) {
+                            int entityStartOffset = entity.getStart() - startOffset;
+                            int entityEndOffset = entity.getEnd() - startOffset;
+                            findSurroundingWords(entity, text, entityStartOffset, entityEndOffset);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Could not get surrounding text!");
+        }
+    }
+
+
+    private void findSurroundingWords(Entity entity, String text, int entityStartOffset, int entityEndOffset) {
+
+        int offsetBefore = entityStartOffset - redactionServiceSettings.getSurroundingWordsOffsetWindow() < 0 ? 0 : entityStartOffset - redactionServiceSettings
+                .getSurroundingWordsOffsetWindow();
+        String textBefore = text.substring(offsetBefore, entityStartOffset);
+        if (!textBefore.isBlank()) {
+            String[] wordsBefore = textBefore.split(" ");
+            int numberOfWordsBefore = wordsBefore.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
+                    .getNumberOfSurroundingWords() : wordsBefore.length;
+            if (wordsBefore.length > 0) {
+                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore));
+            }
+        }
+
+        int endOffset = entityEndOffset + redactionServiceSettings.getSurroundingWordsOffsetWindow() > text.length() ? text
+                .length() : entityEndOffset + redactionServiceSettings.getSurroundingWordsOffsetWindow();
+        String textAfter = text.substring(entityEndOffset, endOffset);
+        if (!textAfter.isBlank()) {
+            String[] wordsAfter = textAfter.split(" ");
+            int numberOfWordsAfter = wordsAfter.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
+                    .getNumberOfSurroundingWords() : wordsAfter.length;
+            if (wordsAfter.length > 0) {
+                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter));
+            }
+        }
+    }
+
+
+    private String concatWordsBefore(String[] words, int number) {
+
+        StringBuilder sb = new StringBuilder();
+
+        int startNumber = words.length > number ? words.length - number : 0;
+
+        for (int i = startNumber; i < words.length; i++) {
+            sb.append(words[i]).append(" ");
+        }
+
+        return sb.toString().trim();
+    }
+
+
+    private String concatWordsAfter(String[] words, int number) {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < number; i++) {
+            sb.append(words[i]).append(" ");
+        }
+
+        return sb.toString().trim();
+    }
+
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.util.regex.Pattern;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class Patterns {
+
+    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2}\\.)+|((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2} )+");
+
+}
@@ -11,7 +11,7 @@ public class TextNormalizationUtilities {
     * @return Text without line-break hyphenation.
     */
    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
    }

 }
@@ -7,12 +7,9 @@ import lombok.Data;
@Data
@ConfigurationProperties("redaction-service")
 public class RedactionServiceSettings {
+    
+    private int numberOfSurroundingWords = 3;

-    /**
-     * Tenant used in single tenant mode.
-     */
-    private String  defaultTenant = "iqser-id";
-
-    private int flattenImageDpi = 100;
+    private int surroundingWordsOffsetWindow = 100;

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

 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;

 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -41,8 +42,13 @@ public class Cell extends Rectangle {

        StringBuilder sb = new StringBuilder();

-        for (TextBlock textBlock : textBlocks) {
-            TextPositionSequence previous = null;
+
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        TextPositionSequence previous = null;
+        while (itty.hasNext()) {
+
+            TextBlock textBlock = itty.next();
+
            for (TextPositionSequence word : textBlock.getSequences()) {
                if (previous != null) {
                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
@@ -54,6 +60,7 @@ public class Cell extends Rectangle {
                sb.append(word.toString());
                previous = word;
            }
+
        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
@@ -61,4 +68,8 @@ public class Cell extends Rectangle {
                .replaceAll(" {2}", " ");
    }

+
+
+
+
 }
@@ -30,12 +30,14 @@ public class TableExtractionService {

        List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());

+        List<TextBlock> toBeRemoved = new ArrayList<>();
+
        for (AbstractTextContainer abstractTextContainer : page.getTextBlocks()) {
            TextBlock textBlock = (TextBlock) abstractTextContainer;
            for (Cell cell : cells) {
-                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(),
-                        textBlock.getHeight())) {
+                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight())) {
                    cell.addTextBlock(textBlock);
+                    toBeRemoved.add(textBlock);
                    break;
                }
            }
@@ -44,7 +46,6 @@ public class TableExtractionService {
        cells = new ArrayList<>(new HashSet<>(cells));
        Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER);

-
        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells).stream()
                .filter(r -> r.getWidth() > 0f && r.getHeight() > 0f)
                .collect(Collectors.toList());
@@ -67,25 +68,23 @@ public class TableExtractionService {
            Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
            while (itty.hasNext()) {
                AbstractTextContainer textBlock = itty.next();
-                if (table.contains(textBlock)) {
-                    if (position == -1) {
-                        position = page.getTextBlocks().indexOf(textBlock);
-                    }
-                    itty.remove();
+                if (table.contains(textBlock) && position == -1) {
+                    position = page.getTextBlocks().indexOf(textBlock);
                }
            }
            if (position != -1) {
                page.getTextBlocks().add(position, table);
            }
        }
+
+        page.getTextBlocks().removeAll(toBeRemoved);
    }


    public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

        List<Cell> cellsFound = new ArrayList<>();
-        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines,
-                verticalRulingLines);
+        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
        intersectionPointsList.sort(POINT_COMPARATOR);

@@ -0,0 +1,111 @@
+package com.iqser.red.service.redaction.v1.server.tableextraction.utils;
+
+import java.util.ArrayDeque;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.List;
+
+/**
+ * Copied and minimal modified from PDFBox.
+ */
+public final class QuickSort {
+
+    private QuickSort() {
+
+    }
+
+
+    private static final Comparator<? extends Comparable> OBJCOMP = new Comparator<Comparable>() {
+        @Override
+        public int compare(Comparable object1, Comparable object2) {
+
+            return object1.compareTo(object2);
+        }
+    };
+
+
+    /**
+     * Sorts the given list using the given comparator.
+     *
+     * @param <T>  type of the objects to be sorted.
+     * @param list list to be sorted
+     * @param cmp  comparator used to compare the objects within the list
+     */
+    public static <T> void sort(List<T> list, Comparator<? super T> cmp) {
+
+        int size = list.size();
+        if (size < 2) {
+            return;
+        }
+        quicksort(list, cmp);
+    }
+
+
+    /**
+     * Sorts the given list using compareTo as comparator.
+     *
+     * @param <T>  type of the objects to be sorted.
+     * @param list list to be sorted
+     */
+    public static <T extends Comparable> void sort(List<T> list) {
+
+        sort(list, (Comparator<T>) OBJCOMP);
+    }
+
+
+    private static <T> void quicksort(List<T> list, Comparator<? super T> cmp) {
+
+        Deque<Integer> stack = new ArrayDeque<Integer>();
+        stack.push(0);
+        stack.push(list.size());
+        while (!stack.isEmpty()) {
+            int right = stack.pop();
+            int left = stack.pop();
+            if (right - left < 2) {
+                continue;
+            }
+            int p = left + ((right - left) / 2);
+            p = partition(list, cmp, p, left, right);
+
+            stack.push(p + 1);
+            stack.push(right);
+
+            stack.push(left);
+            stack.push(p);
+        }
+    }
+
+
+    private static <T> int partition(List<T> list, Comparator<? super T> cmp, int p, int start, int end) {
+
+        int l = start;
+        int h = end - 2;
+        T piv = list.get(p);
+        swap(list, p, end - 1);
+
+        while (l < h) {
+            if (cmp.compare(list.get(l), piv) <= 0) {
+                l++;
+            } else if (cmp.compare(piv, list.get(h)) <= 0) {
+                h--;
+            } else {
+                swap(list, l, h);
+            }
+        }
+        int idx = h;
+        if (cmp.compare(list.get(h), piv) < 0) {
+            idx++;
+        }
+        swap(list, end - 1, idx);
+        return idx;
+    }
+
+
+    private static <T> void swap(List<T> list, int i, int j) {
+
+        T tmp = list.get(i);
+        list.set(i, list.get(j));
+        list.set(j, tmp);
+    }
+
+}
@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.utils;

 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

@@ -13,23 +12,29 @@ public class Utils {

    private final static float EPSILON = 0.1f;

+
    public static boolean feq(double f1, double f2) {
+
        return (Math.abs(f1 - f2) < EPSILON);
    }

+
    public static float round(double d, int decimalPlace) {
+
        BigDecimal bd = BigDecimal.valueOf(d);
        bd = bd.setScale(decimalPlace, BigDecimal.ROUND_HALF_UP);
        return bd.floatValue();
    }

-	public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
+    public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
        try {
-            Collections.sort(list, comparator);
-        } catch (IllegalArgumentException e){
-            //TODO Figure out why this happens.
+            QuickSort.sort(list, comparator);
+        } catch (IllegalArgumentException e) {
+            // This should not happen since we use QuickSort from PDFBox
            log.warn(e.getMessage());
        }
-	}
+    }

 }
@@ -256,6 +256,7 @@ public class AnnotationHighlightService {
                .manual(true)
                .status(manualRedactionEntry.getStatus())
                .manualRedactionType(ManualRedactionType.ADD)
+                .isDictionaryEntry(false)
                .build();
    }

@@ -270,9 +271,13 @@ public class AnnotationHighlightService {
                .type(entity.getType())
                .redacted(entity.isRedaction())
                .isHint(isHint(entity))
+                .isRecommendation(isRecommendation(entity))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
+                .isDictionaryEntry(entity.isDictionaryEntry())
+                .textAfter(entity.getTextAfter())
+                .textBefore(entity.getTextBefore())
                .build();
    }

@@ -401,10 +406,7 @@ public class AnnotationHighlightService {
        if (!entity.isRedaction() && !isHint(entity)) {
            return dictionaryService.getNotRedactedColor();
        }
-        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
-            return dictionaryService.getDefaultColor();
-        }
-        return dictionaryService.getEntryColors().get(entity.getType());
+        return dictionaryService.getColor(entity.getType());
    }


@@ -420,18 +422,16 @@ public class AnnotationHighlightService {


    private float[] getColor(String type) {
-
-        if (!dictionaryService.getEntryColors().containsKey(type)) {
-            return dictionaryService.getDefaultColor();
-        }
-        return dictionaryService.getEntryColors().get(type);
+        return dictionaryService.getColor(type);
    }


    private boolean isHint(Entity entity) {
+        return dictionaryService.isHint(entity.getType());
+    }

-        List<String> hintTypes = dictionaryService.getHintTypes();
-        return CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType());
+    private boolean isRecommendation(Entity entity) {
+        return dictionaryService.isRecommendation(entity.getType());
    }


@@ -1,68 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.visualization.service;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.rendering.ImageType;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class PdfFlattenService {
-
-    private final RedactionServiceSettings settings;
-
-    public PDDocument flattenPDF(PDDocument sourceDoc) throws IOException {
-
-        PDDocument destDoc = new PDDocument();
-
-        PDFRenderer pdfRenderer = new PDFRenderer(sourceDoc);
-
-        final int pageCount = sourceDoc.getDocumentCatalog().getPages().getCount();
-
-        log.info(pageCount + " page" + (pageCount == 1 ? "" : "s") + " to flatten.");
-
-        for (int i = 0; i < pageCount; i += 1) {
-
-            log.info("Flattening page " + (i + 1) + " of " + pageCount + "...");
-
-            BufferedImage img = pdfRenderer.renderImageWithDPI(i, settings.getFlattenImageDpi(), ImageType.RGB);
-
-            log.info("Image rendered in memory (" + img.getWidth() + "x" + img.getHeight() + " " + settings.getFlattenImageDpi() + "DPI).  Adding to PDF...");
-
-            PDPage imagePage = new PDPage(new PDRectangle(img.getWidth(), img.getHeight()));
-            destDoc.addPage(imagePage);
-
-            PDImageXObject imgObj = LosslessFactory.createFromImage(destDoc, img);
-
-            PDPageContentStream imagePageContentStream = new PDPageContentStream(destDoc, imagePage);
-            imagePageContentStream.drawImage(imgObj, 0, 0);
-
-            log.info("Image added successfully.");
-
-            imagePageContentStream.close();
-
-            img.flush();
-        }
-
-        log.info("New flattened PDF created in memory.");
-
-        sourceDoc.close();
-
-        return destDoc;
-    }
-
-}
@@ -69,7 +69,7 @@ public class RedactionIntegrationTest {
    private static final String VERTEBRATE = "vertebrate";
    private static final String ADDRESS = "CBI_address";
    private static final String AUTHOR = "CBI_author";
-    private static final String SPONSOR = "sponsor";
+    private static final String SPONSOR = "CBI_sponsor";
    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
    private static final String REDACTION_INDICATOR = "redaction_indicator";
    private static final String HINT_ONLY = "hint_only";
@@ -77,6 +77,11 @@ public class RedactionIntegrationTest {
    private static final String PUBLISHED_INFORMATION = "published_information";
    private static final String TEST_METHOD = "test_method";

+    private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
+    private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
+
+    private static final String FALSE_POSITIVE = "false_positive";
+
    private static final String PII = "PII";

    @Autowired
@@ -92,6 +97,7 @@ public class RedactionIntegrationTest {
    private final Map<String, String> typeColorMap = new HashMap<>();
    private final Map<String, Boolean> hintTypeMap = new HashMap<>();
    private final Map<String, Boolean> caseInSensitiveMap = new HashMap<>();
+    private final Map<String, Boolean> recommendationTypeMap = new HashMap<>();
    private final Colors colors = new Colors();

    @TestConfiguration
@@ -137,6 +143,9 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION));
        when(dictionaryClient.getDictionaryForType(TEST_METHOD)).thenReturn(getDictionaryResponse(TEST_METHOD));
        when(dictionaryClient.getDictionaryForType(PII)).thenReturn(getDictionaryResponse(PII));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
        when(dictionaryClient.getColors()).thenReturn(colors);
    }

@@ -149,7 +158,7 @@ public class RedactionIntegrationTest {
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/sponsor.txt")
+                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
@@ -198,6 +207,21 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_AUTHOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_author.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_address.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(FALSE_POSITIVE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/false_positive.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
    }


@@ -220,7 +244,9 @@ public class RedactionIntegrationTest {
        typeColorMap.put(PUBLISHED_INFORMATION, "#85ebff");
        typeColorMap.put(TEST_METHOD, "#91fae8");
        typeColorMap.put(PII, "#66ccff");
-
+        typeColorMap.put(RECOMMENDATION_AUTHOR, "#8df06c");
+        typeColorMap.put(RECOMMENDATION_ADDRESS, "#8df06c");
+        typeColorMap.put(FALSE_POSITIVE, "#ffffff");

        hintTypeMap.put(VERTEBRATE, true);
        hintTypeMap.put(ADDRESS, false);
@@ -233,6 +259,9 @@ public class RedactionIntegrationTest {
        hintTypeMap.put(PUBLISHED_INFORMATION, true);
        hintTypeMap.put(TEST_METHOD, true);
        hintTypeMap.put(PII, false);
+        hintTypeMap.put(RECOMMENDATION_AUTHOR, false);
+        hintTypeMap.put(RECOMMENDATION_ADDRESS, false);
+        hintTypeMap.put(FALSE_POSITIVE, true);

        caseInSensitiveMap.put(VERTEBRATE, true);
        caseInSensitiveMap.put(ADDRESS, false);
@@ -245,6 +274,24 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(PUBLISHED_INFORMATION, true);
        caseInSensitiveMap.put(TEST_METHOD, false);
        caseInSensitiveMap.put(PII, false);
+        caseInSensitiveMap.put(RECOMMENDATION_AUTHOR, false);
+        caseInSensitiveMap.put(RECOMMENDATION_ADDRESS, false);
+        caseInSensitiveMap.put(FALSE_POSITIVE, false);
+
+        recommendationTypeMap.put(VERTEBRATE, false);
+        recommendationTypeMap.put(ADDRESS, false);
+        recommendationTypeMap.put(AUTHOR, false);
+        recommendationTypeMap.put(SPONSOR, false);
+        recommendationTypeMap.put(NO_REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(HINT_ONLY, false);
+        recommendationTypeMap.put(MUST_REDACT, false);
+        recommendationTypeMap.put(PUBLISHED_INFORMATION, false);
+        recommendationTypeMap.put(TEST_METHOD, false);
+        recommendationTypeMap.put(PII, false);
+        recommendationTypeMap.put(RECOMMENDATION_AUTHOR, true);
+        recommendationTypeMap.put(RECOMMENDATION_ADDRESS, true);
+        recommendationTypeMap.put(FALSE_POSITIVE, false);

        colors.setDefaultColor("#acfc00");
        colors.setNotRedacted("#cccccc");
@@ -262,6 +309,7 @@ public class RedactionIntegrationTest {
                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
+                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
                        .build())

                .collect(Collectors.toList());
@@ -275,6 +323,7 @@ public class RedactionIntegrationTest {
                .entries(dictionary.get(type))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
+                .isRecommendation(recommendationTypeMap.get(type))
                .build();
    }

@@ -282,6 +331,7 @@ public class RedactionIntegrationTest {
    @Test
    public void noExceptionShouldBeThrownForAnyFiles() throws IOException {

+        long start = System.currentTimeMillis();
        System.out.println("noExceptionShouldBeThrownForAnyFiles");
        ClassLoader loader = getClass().getClassLoader();
        URL url = loader.getResource("files");
@@ -307,6 +357,10 @@ public class RedactionIntegrationTest {
            });
        }

+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+
    }


@@ -333,7 +387,7 @@ public class RedactionIntegrationTest {

        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -342,6 +396,12 @@ public class RedactionIntegrationTest {

        RedactionResult result = redactionController.redact(request);

+//        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+//            if(!entry.isHint()){
+//                System.out.println(entry.getPositions().get(0).getPage() +":"+ entry.getTextBefore() +"--->"+ entry.getValue() + "--->" + entry.getTextAfter());
+//            }
+//        });
+
        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
            fileOutputStream.write(result.getDocument());
        }
@@ -431,7 +491,7 @@ public class RedactionIntegrationTest {
    public void classificationTest() throws IOException {

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -467,7 +527,7 @@ public class RedactionIntegrationTest {
    public void htmlTablesTest() throws IOException {

        System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/line_breaks.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -14,8 +14,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -101,8 +104,8 @@ public class EntityRedactionServiceTest {
    public void testNestedEntitiesRemoval() {

        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
        entities.add(nested);
        entities.add(nesting);
        entityRedactionService.removeEntitiesContainedInLarger(entities);
@@ -230,7 +233,7 @@ public class EntityRedactionServiceTest {
                .build();
        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -340,7 +343,7 @@ public class EntityRedactionServiceTest {
                .build();
        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse);
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                .build();
        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse);
        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -401,7 +404,7 @@ public class EntityRedactionServiceTest {
            entityRedactionService.processDocument(classifiedDoc, null);
            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
-            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(8);
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
        }
    }

@@ -446,7 +449,7 @@ public class EntityRedactionServiceTest {
                "    when\n" +
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
                "    then\n" +
-                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", false, \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
                "    end\n" +
@@ -455,7 +458,7 @@ public class EntityRedactionServiceTest {
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
                "\"Yes\"))\n" +
                "    then\n" +
-                "        section.redactCell(\"Author(s)\", 9,  \"name\", \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
                " 1107/2009 Art. 63 (2g)\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
@@ -510,4 +513,28 @@ public class EntityRedactionServiceTest {
        }
    }

+
+    @Test
+    public void testAuthorSplitting(){
+
+        String word = "Porch JR, " + "Kendall TZ, " + "Krueger HO";
+
+        word.replaceAll(",", " ").replaceAll("  ", " ");
+
+        Pattern pattern = Pattern.compile("[A-ZÄÖÜ][\\wäöüéèê]{2,}( [A-ZÄÖÜ]{1,2}\\.)+");
+        Matcher matcher = pattern.matcher(word);
+
+        List<String> allMatches = new ArrayList<>();
+        while (matcher.find()) {
+            allMatches.add(matcher.group());
+        }
+
+        for(String name: allMatches) {
+            if(name.length() >= 3) {
+                System.out.println(name);
+//                dictionaryService.addToLocalDictionary(type, name);
+            }
+        }
+    }
+
 }
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class TextNormalizationUtilities {
-
-    /**
-     * Revert hyphenation due to line breaks.
-     * @param text Text to be processed.
-     * @return Text without line-break hyphenation.
-     */
-    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
-    }
-
-}
@@ -10,11 +10,11 @@ public class TextNormalizationUtilitiesTest {

        String test = "Without these peo-\nple, this conference would not happen";
        Assertions.assertThat(TextNormalizationUtilities.removeHyphenLineBreaks(test))
-                .contains("\npeople");
+                .contains("people");

        test = "Die\t\nFreiwillige\t Versicherung\t endet\t zudem\t für\t den\t ein\u00AD\nzelnen\tVersicherten\tmit\tder\tAufhebung\tdes\tVertra-\nges,\t seiner\t Unterstellung\t unter\t die\t obligatorische\t\nVersicherung\t oder\t seinem\t Ausschluss.";
        Assertions.assertThat(TextNormalizationUtilities.removeHyphenLineBreaks(test))
-                .contains("\neinzelnen", "\nVertrages");
+                .contains("einzelnen", "Vertrages");

    }

@@ -8586,4 +8586,4 @@ Zoriki Hosomi R.
 Zoriki Hosomi Rosana
 Zuberer D
 Zubrod J
-Zwicker R.E.
+Zwicker R.E.
@@ -0,0 +1,10 @@
+Long-term
+Brown liquid
+Brown solid
+Hand-held
+Manual-Hand held
+Manual-Hand held
+Weight:
+Sprague
+Weight and length
+Aeration: Gentle
@@ -1 +0,0 @@
-determination of residues
@@ -167,7 +167,6 @@ sheepshead minnow
 sheepshead minnows
 shrew
 shrews
-Singh
 sorex araneus
 spea multiplicata
 spotted march frog
@@ -56,7 +56,8 @@ rule "6: Not redacted because Vertebrate Study = N"
    when
        Section(rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No"))
    then
-        section.redactNotCell("Author(s)", 6, "CBI_author", "Not redacted because row is not a vertebrate study");
+        section.redactNotCell("Author(s)", 6, "CBI_author", true, "Not redacted because row is not a vertebrate study");
+        section.redactNot("CBI_author", 6, "Not redacted because row is not a vertebrate study");
        section.redactNot("CBI_address", 6, "Not redacted because row is not a vertebrate study");
        section.highlightCell("Vertebrate study Y/N", 6, "hint_only");
    end
@@ -75,7 +76,7 @@ rule "8: Redact Authors and Addresses in Reference Table if it is a Vertebrate s
    when
        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes"))
    then
-        section.redactCell("Author(s)", 8, "CBI_author", "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redactCell("Author(s)", 8, "CBI_author", true, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.redact("CBI_address", 8, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.highlightCell("Vertebrate study Y/N", 8, "must_redact");
    end
@@ -85,7 +86,7 @@ rule "9: Redact sponsor company"
    when
        Section(searchText.toLowerCase().contains("batches produced at"))
    then
-        section.redactIfPrecededBy("batches produced at", "sponsor", 9, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redactIfPrecededBy("batches produced at", "CBI_sponsor", 9, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.addHintAnnotation("batches produced at", "must_redact");
    end

@@ -95,10 +96,12 @@ rule "10: Redact determination of residues"
 		Section(searchText.toLowerCase.contains("determination of residues") && (
 			searchText.toLowerCase.contains("livestock") ||
 			searchText.toLowerCase.contains("live stock") ||
-			searchText.toLowerCase.contains("egg") ||
-			searchText.toLowerCase.contains("milk") ||
+			searchText.toLowerCase.contains("tissue") ||
+			searchText.toLowerCase.contains("liver") ||
+			searchText.toLowerCase.contains("muscle") ||
 			searchText.toLowerCase.contains("bovine") ||
-			searchText.toLowerCase.contains("ruminant")
+			searchText.toLowerCase.contains("ruminant") ||
+			searchText.toLowerCase.contains("ruminants")
 		))
 	then
 		section.redact("CBI_author", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
@@ -106,94 +109,145 @@ rule "10: Redact determination of residues"
 		section.addHintAnnotation("determination of residues", "must_redact");
 		section.addHintAnnotation("livestock", "must_redact");
 		section.addHintAnnotation("live stock", "must_redact");
-		section.addHintAnnotation("egg", "must_redact");
-		section.addHintAnnotation("milk", "must_redact");
+		section.addHintAnnotation("tissue", "must_redact");
+		section.addHintAnnotation("liver", "must_redact");
+		section.addHintAnnotation("muscle", "must_redact");
 		section.addHintAnnotation("bovine", "must_redact");
 		section.addHintAnnotation("ruminant", "must_redact");
+		section.addHintAnnotation("ruminants", "must_redact");
 	end


+rule "11: Redact if CTL/* or BL/*  was found"
+    when
+        Section(searchText.contains("CTL/") || searchText.contains("BL/"))
+    then
+		section.redact("CBI_author", 11, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("CBI_address", 11, "Laboraty for vertebrate studies found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.addHintAnnotation("CTL", "must_redact");
+		section.addHintAnnotation("BL", "must_redact");
+    end
+
+
 // --------------------------------------- PII rules -------------------------------------------------------------------


-rule "11: Redacted PII Personal Identification Information"
+rule "12: Redacted PII Personal Identification Information"
 	when
 		Section(matchesType("PII"))
 	then
-		section.redact("PII", 11, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redact("PII", 12, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
 	end


-rule "12: Redact contact information if applicant is found"
+rule "13: Redact contact information"
+    when
+       Section(text.contains("Contact point:")
+       || text.contains("Phone:")
+       || text.contains("Fax:")
+       || text.contains("Tel.:")
+       || text.contains("Tel:")
+       || text.contains("E-mail:")
+       || text.contains("Email:")
+       || text.contains("e-mail:")
+       || text.contains("E-mail address:")
+       || text.contains("Alternative contact:")
+       || text.contains("Telephone number:")
+       || text.contains("Telephone No:")
+       || text.contains("Fax number:")
+       || text.contains("Telephone:")
+       || text.contains("European contact:"))
+    then
+      	section.redactLineAfter("Contact point:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Phone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Fax:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Tel:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("E-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Email:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("e-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("E-mail address:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Alternative contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone No:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Fax number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("Telephone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactBetween("No:", "Fax", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactBetween("Contact:", "Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+      		section.redactLineAfter("European contact:",  "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+     end
+
+
+rule "14: Redact contact information if applicant is found"
 	when
 		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Contact:") || text.contains("Telephone number:"))
 	then
-		section.redactLineAfter("Contact point:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Phone:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel.:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Email:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("e-mail:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail address:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Contact:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Alternative contact:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone number:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone No:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax number:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Company:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("No:", "Fax", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("Contact:", "Tel.:", "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("European contact:",  "PII", 12, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact point:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Phone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Email:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("e-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail address:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Alternative contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone No:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("No:", "Fax", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("Contact:", "Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("European contact:",  "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
 	end


-rule "13: Redact contact information if Producer is found"
+rule "15: Redact contact information if Producer is found"
 	when
 		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
 	then
-		section.redactLineAfter("Contact:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Phone:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Contact:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax number:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone number:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel:", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("No:", "Fax", "PII", 13, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Phone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("E-mail:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Fax number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Telephone number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactLineAfter("Tel:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+		section.redactBetween("No:", "Fax", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
 	end


-rule "14: Redact AUTHOR(S)"
+rule "16: Redact AUTHOR(S)"
    when
        Section(searchText.contains("AUTHOR(S):"))
    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 14, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 16, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "15: Redact PERFORMING LABORATORY"
+rule "17: Redact PERFORMING LABORATORY"
    when
        Section(searchText.contains("PERFORMING LABORATORY:"))
    then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 15, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 17, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "16: Redact On behalf of Sequani Ltd.:"
+rule "18: Redact On behalf of Sequani Ltd.:"
    when
        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
    then
-        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 16, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 18, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "17: Redact On behalf of Syngenta Ltd.:"
+rule "19: Redact On behalf of Syngenta Ltd.:"
    when
        Section(searchText.contains("On behalf of Syngenta Ltd.: Name Title"))
    then
-        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 17, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 19, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
Author	SHA1	Message	Date
Dominique Eifländer	000b145e71	Fixed 'Comparison method violates its general contract' by using QuickSort from PDFBox	2020-12-22 16:04:29 +01:00
Dominique Eiflaender	7dbc735b16	Pull request #83 : RED-882: Added textBefore and textAfter to redaction log Merge in RED/redaction-service from RED-882 to master * commit 'caf6277de9e0d175d3ff11c1e7819cfbc37f3539': RED-882: Added textBefore and textAfter to redaction log	2020-12-18 14:41:23 +01:00
Dominique Eifländer	caf6277de9	RED-882: Added textBefore and textAfter to redaction log	2020-12-18 14:31:27 +01:00
Dominique Eiflaender	add196f913	Pull request #82 : RED-871: Fixed endless processing on document with corrupted contentStream Merge in RED/redaction-service from RED-871 to master * commit 'bfa363a3d2903bb9bf68c7721740e95b2f1a4925': RED-871: Fixed endless processing on document with corrupted contentStream	2020-12-11 11:39:00 +01:00
deiflaender	bfa363a3d2	RED-871: Fixed endless processing on document with corrupted contentStream	2020-12-11 11:26:48 +01:00
deiflaender	50ec16601c	Fixed table offset bug	2020-12-10 19:33:58 +01:00
Dominique Eiflaender	03a09860f4	Pull request #81 : RED-864, Added isDictionaryEntry to redactionLog. Merge in RED/redaction-service from RED-864 to master * commit 'e43bd1b71134ce9d34cc521459240c10606de7fc': RED-864, Added isDictionaryEntry to redactionLog. Fixed order of dictionary types	2020-12-10 12:45:53 +01:00
deiflaender	e43bd1b711	RED-864, Added isDictionaryEntry to redactionLog. Fixed order of dictionary types	2020-12-10 12:37:51 +01:00
Dominique Eiflaender	000054d8ab	Pull request #80 : Made dictionaries Theadsafe Merge in RED/redaction-service from ThreadSafe to master * commit '44613ee1174da877ee87414903c126bd7c25c311': Made dictionaries Theadsafe	2020-12-09 17:28:12 +01:00
deiflaender	44613ee117	Made dictionaries Theadsafe	2020-12-09 17:09:11 +01:00
Dominique Eiflaender	3f69030b03	Pull request #79 : RED-824: Add author recommendations based on vertebrate study tables Merge in RED/redaction-service from RED-824 to master * commit '608ea4bbcc3943dc8f37d3ad2254dd095edd50fd': RED-824: Add author recommendations based on vertebrate study tables	2020-12-07 16:41:08 +01:00
deiflaender	608ea4bbcc	RED-824: Add author recommendations based on vertebrate study tables	2020-12-07 15:53:20 +01:00
Dominique Eiflaender	9b7deca3db	Pull request #78 : Fixed duplicate Textblock in Tables Merge in RED/redaction-service from FixDuplicate to master * commit 'c90eee23c4f9f1fbc319cedb3c2aa8ce63a72101': Fixed duplicate Textblock in Tables	2020-12-03 15:26:53 +01:00
deiflaender	c90eee23c4	Fixed duplicate Textblock in Tables	2020-12-03 15:17:33 +01:00
Dominique Eiflaender	8619e51480	Pull request #77 : RED-740: Improved section recognition Merge in RED/redaction-service from RED-740 to master * commit '4ef6e0e2ef26ccea6d094f7ddcb8bc9c7e122d3a': RED-740: Improved section recognition	2020-11-30 10:39:21 +01:00
deiflaender	4ef6e0e2ef	RED-740: Improved section recognition	2020-11-27 15:39:31 +01:00
Timo Bejan	0f0f6b3a2e	Pull request #76 : Added rank of dictionary to processing entities in redaction service, simplified code Merge in RED/redaction-service from feature/RED-786 to master * commit '3c4d6dd2f24ccbb1330657c2f7e396b8f91bb671': fixed awt auto * fixed Tests & fallback removed import Added rank of dictionary to processing entities in redaction service, simplified code	2020-11-26 19:29:02 +01:00
Timo	3c4d6dd2f2	fixed awt auto *	2020-11-26 20:20:43 +02:00
Timo	0e645ab273	fixed Tests & fallback	2020-11-26 20:12:36 +02:00
Timo	cc1a3c9e49	removed import	2020-11-26 18:56:02 +02:00
Timo	536d4689f3	Added rank of dictionary to processing entities in redaction service, simplified code	2020-11-26 18:52:44 +02:00
Christoph Schabert	f458a1f930	PlanSpec.java edited online with Bitbucket	2020-11-26 13:37:27 +01:00
Dominique Eiflaender	3c942aba15	Pull request #75 : Rename sponsor dictionary to CBI_sponsor Merge in RED/redaction-service from CBI_sponsor to master * commit 'd466d9b0328d04967b9026a45ff57d49b7f89ec6': Rename sponsor dictionary to CBI_sponsor	2020-11-26 12:17:43 +01:00
deiflaender	d466d9b032	Rename sponsor dictionary to CBI_sponsor	2020-11-26 12:09:19 +01:00