Fixed positions

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -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("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("gin4", 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());
     }
-}
+}

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

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

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

@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CellRectangle {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-
-}

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

@@ -22,7 +22,6 @@ public class RedactionLogEntry {
     private String legalBasis;
     private boolean redacted;
     private boolean isHint;
-    private boolean isRecommendation;
     private String section;
     private float[] color;
 
@@ -32,9 +31,5 @@ public class RedactionLogEntry {
     private boolean manual;
     private Status status;
     private ManualRedactionType manualRedactionType;
-    private boolean isDictionaryEntry;
-
-    private String textBefore;
-    private String textAfter;
 
 }

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

@@ -14,6 +14,5 @@ public class RedactionResult {
     private byte[] document;
     private int numberOfPages;
     private RedactionLog redactionLog;
-    private SectionGrid sectionGrid;
 
 }

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

@@ -1,18 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SectionGrid {
-
-    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
-
-}

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

@@ -1,33 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@RequiredArgsConstructor
-public class SectionRectangle {
-
-    @NonNull
-    private Point topLeft;
-
-    @NonNull
-    private float width;
-
-    @NonNull
-    private float height;
-
-    @NonNull
-    private int part;
-
-    @NonNull
-    private int numberOfParts;
-
-    private List<CellRectangle> tableCells;
-}

redaction-service-v1/redaction-service-server-v1/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.3.7</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>

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

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 
 import lombok.Data;
@@ -26,7 +25,4 @@ public class Document {
     private boolean headlines;
 
     private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-    private SectionGrid sectionGrid = new SectionGrid();
-    private long dictionaryVersion;
-    private long rulesVersion;
 }

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

@@ -97,7 +97,13 @@ public class TextBlock extends AbstractTextContainer {
         this.maxY = Math.max(y1, y2);
     }
 
+    public float getHeight() {
+        return maxY - minY;
+    }
 
+    public float getWidth() {
+        return maxX - minX;
+    }
 
     @Override
     public String toString() {

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

@@ -5,17 +5,15 @@ 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 {
@@ -30,7 +28,7 @@ public class ClassificationService {
 
         List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();
 
-        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());
+        System.out.println(document.getFontSizeCounter().getCountPerValue());
 
         for (Page page : document.getPages()) {
             Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
@@ -41,7 +39,6 @@ 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);
@@ -50,33 +47,24 @@ 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)) {
@@ -84,34 +72,20 @@ public class ClassificationService {
                     document.setHeadlines(true);
                 }
             }
-        } 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) {
+        }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) {
             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");
         }
     }
-
 }

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

@@ -13,23 +13,22 @@ import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
 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,8 +37,9 @@ 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
     public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
@@ -48,17 +48,15 @@ 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());
+            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest.getManualRedactions());
 
-            log.info("Redaction analysis successful...");
+            if (redactionRequest.isFlatRedaction()) {
+                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
+                return convert(flatDocument, classifiedDoc.getPages().size(), classifiedDoc.getRedactionLogEntities());
+            }
 
-            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
+            return convert(pdDocument, classifiedDoc.getPages().size(), classifiedDoc.getRedactionLogEntities());
 
         } catch (IOException e) {
             throw new RedactionException(e);
@@ -66,7 +64,6 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
 
@@ -84,7 +81,6 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
 
@@ -102,7 +98,6 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {
 
@@ -129,31 +124,24 @@ public class RedactionController implements RedactionResource {
 
     }
 
-
     @Override
     public void updateRules(@RequestBody String rules) {
-
         droolsExecutionService.updateRules(rules);
     }
 
 
     private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-
-        return convert(document, numberOfPages, null, null, 0, 0);
+        return convert(document, numberOfPages, null);
     }
 
-
-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {
+    private RedactionResult convert(PDDocument document, int numberOfPages, List<RedactionLogEntry> redactionLogEntities) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
             document.save(byteArrayOutputStream);
             return RedactionResult.builder()
                     .document(byteArrayOutputStream.toByteArray())
                     .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
-                    .sectionGrid(sectionGrid)
+                    .redactionLog(new RedactionLog(redactionLogEntities,  dictionaryService.getDictionaryVersion(), droolsExecutionService.getRulesVersion()))
                     .build();
         }
 

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

@@ -210,7 +210,7 @@ public class TextPositionSequence implements CharSequence {
                     .getYDirAdj() + 2;
         }
 
-        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        return new Rectangle(new Point(posXInit + 0.00001f, posYInit), posXEnd - posXInit - 0.00001f, posYEnd - posYInit + height, page);
     }
 
 

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

@@ -1,8 +1,5 @@
 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;
@@ -12,9 +9,9 @@ import lombok.Value;
 @Value
 public class CellValue {
 
-    private List<TextBlock> textBlocks;
+    TextBlock textBlock;
 
-    private int rowSpanStart;
+    int rowSpanStart;
 
 
     @Override
@@ -22,24 +19,17 @@ public class CellValue {
 
         StringBuilder sb = new StringBuilder();
 
-        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(' ');
-                    }
+        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())

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

@@ -1,88 +0,0 @@
-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;
-    }
-
-}

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

@@ -1,27 +0,0 @@
-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;
-    }
-
-}

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

@@ -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,10 +20,7 @@ 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
@@ -33,13 +30,8 @@ public class Entity {
     @EqualsAndHashCode.Include
     private int sectionNumber;
 
-    private boolean isDictionaryEntry;
 
-    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) {
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis) {
 
         this.word = word;
         this.type = type;
@@ -50,13 +42,10 @@ 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, boolean isDictionaryEntry) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber) {
 
         this.word = word;
         this.type = type;
@@ -64,7 +53,6 @@ public class Entity {
         this.end = end;
         this.headline = headline;
         this.sectionNumber = sectionNumber;
-        this.isDictionaryEntry = isDictionaryEntry;
     }
 
 }

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

@@ -1,20 +1,14 @@
 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.utils.Patterns;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -24,13 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 @Builder
 public class Section {
 
-    private boolean isLocal;
-
-    private Set<String> dictionaryTypes;
-
-    @Builder.Default
-    private Map<String, Set<String>> localDictionaryAdds = new HashMap<>();
-
     private Set<Entity> entities;
 
     // This still contains linebreaks etc.
@@ -51,7 +38,8 @@ public class Section {
         String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
 
         return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
-                .toString()
+                .getTextBlock()
+                .getText()
                 .equals(value);
     }
 
@@ -70,11 +58,8 @@ 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) || hasRecommendactionDictionary && entity.getType()
-                    .equals(RECOMMENDATION_PREFIX + type)) {
+            if (entity.getType().equals(type)) {
                 entity.setRedaction(true);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -86,11 +71,8 @@ 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) || hasRecommendactionDictionary && entity.getType()
-                    .equals(RECOMMENDATION_PREFIX + type)) {
+            if (entity.getType().equals(type)) {
                 entity.setRedaction(false);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -112,24 +94,14 @@ public class Section {
     }
 
 
-    public void addHintAnnotation(String value, String asType) {
-
-        Set<Entity> found = findEntities(value.trim(), asType, true);
-        entities.addAll(found);
-    }
-
-
-    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
-                                String legalBasis) {
+    public void redactLineAfter(String start, String asType, int ruleNumber, String reason, String legalBasis) {
 
         String[] values = StringUtils.substringsBetween(text, start, "\n");
 
         if (values != null) {
             for (String value : values) {
                 if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
+                    Set<Entity> found = findEntities(value.trim(), asType);
                     entities.addAll(found);
                 }
             }
@@ -148,21 +120,15 @@ public class Section {
     }
 
 
-    public void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
-                              String reason, String legalBasis) {
+    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason, String legalBasis) {
 
         String[] values = StringUtils.substringsBetween(searchText, start, stop);
 
         if (values != null) {
             for (String value : values) {
                 if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
+                    Set<Entity> found = findEntities(value.trim(), asType);
                     entities.addAll(found);
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
-                    }
                 }
             }
         }
@@ -179,67 +145,25 @@ public class Section {
     }
 
 
-    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
-                                   String reason, String legalBasis) {
-
-        String[] values = StringUtils.substringsBetween(text, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    String[] lines = value.split("\n");
-
-                    for (String line : lines) {
-
-                        if (line.trim().length() <= 2) {
-                            return;
-                        }
-
-                        Set<Entity> found = findEntities(line.trim(), asType, false);
-
-                        // HashSet keeps the older value, but we want the new only.
-                        entities.removeAll(found);
-                        entities.addAll(found);
-                        if (redactEverywhere && !isLocal()) {
-                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
-                        }
-                    }
-                }
-            }
-        }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private Set<Entity> findEntities(String value, String asType, boolean caseinsensitive) {
-
-        if (value.trim().length() <= 2) {
-            return new HashSet<>();
-        }
+    private Set<Entity> findEntities(String value, String asType) {
 
         Set<Entity> found = new HashSet<>();
 
-        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
-        String searchValue = caseinsensitive ? value.toLowerCase() : value;
-
         int startIndex;
         int stopIndex = 0;
         do {
-            startIndex = text.indexOf(searchValue, stopIndex);
-            stopIndex = startIndex + searchValue.length();
+            startIndex = searchText.indexOf(value, stopIndex);
+            stopIndex = startIndex + value.length();
 
-            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, false));
+            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(searchText.charAt(startIndex - 1)) || isSeparator(
+                    searchText.charAt(startIndex - 1))) && (stopIndex == searchText.length() || isSeparator(searchText.charAt(
+                    stopIndex)))) {
+                found.add(new Entity(searchText.substring(startIndex, stopIndex),
+                                     asType,
+                                     startIndex,
+                                     stopIndex,
+                                     headline,
+                                     sectionNumber));
             }
         } while (startIndex > -1);
 
@@ -249,7 +173,8 @@ public class Section {
 
     private boolean isSeparator(char c) {
 
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}",
+                                                            String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
     }
 
 
@@ -271,26 +196,23 @@ public class Section {
 
     public void highlightCell(String cellHeader, int ruleNumber, String type) {
 
-        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
+        annotateCell(cellHeader, ruleNumber, type, false, null, null);
     }
 
 
-    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
-                           String legalBasis) {
+    public void redactCell(String cellHeader, int ruleNumber, String type, String reason, String legalBasis) {
 
-        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+        annotateCell(cellHeader, ruleNumber, type, true, reason, legalBasis);
     }
 
 
-    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
-                              String reason) {
+    public void redactNotCell(String cellHeader, int ruleNumber, String type, String reason) {
 
-        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
+        annotateCell(cellHeader, ruleNumber, type, false, reason, null);
     }
 
 
-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
-                              boolean addAsRecommendations, String reason, String legalBasis) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, String reason, String legalBasis) {
 
         String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
 
@@ -299,14 +221,17 @@ 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, false);
+            Entity entity = new Entity(word,
+                                       type,
+                                       value.getRowSpanStart(),
+                                       value.getRowSpanStart() + word.length(),
+                                       headline,
+                                       sectionNumber);
             entity.setRedaction(redact);
             entity.setMatchedRule(ruleNumber);
             entity.setRedactionReason(reason);
-            entity.setTargetSequences(value.getTextBlocks()
-                    .get(0)
-                    .getSequences()); // Make sure no other cells with same content are highlighted
+            entity.setTargetSequences(value.getTextBlock()
+                                              .getSequences()); // Make sure no other cells with same content are highlighted
             entity.setLegalBasis(legalBasis);
 
             // HashSet keeps the older value, but we want the new only.
@@ -314,30 +239,7 @@ 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);
-                    }
-                }
-            }
         }
     }
 
 }
-
-
-
-
-
-

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

@@ -1,13 +0,0 @@
-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;
-
-}

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

@@ -2,7 +2,6 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import java.awt.Color;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -11,15 +10,12 @@ import java.util.Set;
 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;
@@ -31,14 +27,22 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class DictionaryService {
 
-
     private final DictionaryClient dictionaryClient;
 
     @Getter
     private long dictionaryVersion = -1;
 
     @Getter
-    private List<DictionaryModel> dictionary = new ArrayList<>();
+    private Map<String, Set<String>> dictionary = new HashMap<>();
+
+    @Getter
+    private Map<String, float[]> entryColors = new HashMap<>();
+
+    @Getter
+    private List<String> hintTypes = new ArrayList<>();
+
+    @Getter
+    private List<String> caseInsensitiveTypes = new ArrayList<>();
 
     @Getter
     private float[] defaultColor;
@@ -53,10 +57,6 @@ public class DictionaryService {
     private float[] notRedactedColor;
 
 
-    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
-
-
-
     public void updateDictionary() {
 
         long version = dictionaryClient.getVersion();
@@ -72,16 +72,23 @@ public class DictionaryService {
         try {
             TypeResponse typeResponse = dictionaryClient.getAllTypes();
             if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
-
-                dictionary = typeResponse.getTypes()
+                entryColors = typeResponse.getTypes()
                         .stream()
-                        .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.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)
+                        .collect(Collectors.toList());
+                dictionary = entryColors.keySet()
+                        .stream()
+                        .collect(Collectors.toMap(type -> type, this::convertEntries));
 
-                localAccessMap.clear();
-                dictionary.forEach(dm -> localAccessMap.put(dm.getType(), dm));
 
                 Colors colors = dictionaryClient.getColors();
                 defaultColor = convertColor(colors.getDefaultColor());
@@ -96,30 +103,16 @@ public class DictionaryService {
     }
 
 
-    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);
-                }
-            }
-        });
-    }
+    private Set<String> convertEntries(String s) {
 
-
-    private Set<String> convertEntries(TypeResult t) {
-
-        if (t.isCaseInsensitive()) {
-            return dictionaryClient.getDictionaryForType(t.getType())
+        if (caseInsensitiveTypes.contains(s)) {
+            return dictionaryClient.getDictionaryForType(s)
                     .getEntries()
                     .stream()
                     .map(String::toLowerCase)
                     .collect(Collectors.toSet());
-        } else {
-            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType()).getEntries());
         }
+        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
     }
 
 
@@ -129,54 +122,4 @@ 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);
-    }
-
 }

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

@@ -7,8 +7,6 @@ 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;
@@ -21,86 +19,30 @@ 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();
-        long rulesVersion = droolsExecutionService.getRulesVersion();
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary();
-
-        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) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
-                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter()));
-            }
-        }
-
-        dictionaryService.updateExternalDictionary(dictionary);
-
-        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
-        classifiedDoc.setRulesVersion(rulesVersion);
-    }
-
-
-    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();
@@ -113,7 +55,6 @@ 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;
@@ -127,98 +68,71 @@ public class EntityRedactionService {
                                     .replaceAll("\n", "")
                                     .replaceAll(" ", "")
                                     .replaceAll("-", "");
-                            tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                            tabularData.put(headerName, new CellValue(cell.getTextBlocks().get(0), 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
-                            .getDictionaryModels(), local);
-                    surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
+                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber);
 
-                    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)
+                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
+                            .entities(rowEntities)
                             .text(searchableRow.getAsStringWithLinebreaks())
                             .searchText(searchableRow.toString())
                             .headline(table.getHeadline())
                             .sectionNumber(sectionNumber)
                             .tabularData(tabularData)
-                            .build(), searchableRow));
+                            .build());
 
+                    documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), searchableRow));
                     sectionNumber++;
                 }
                 sectionNumber++;
             }
 
             addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            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)
+            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber);
+            Section analysedSection = droolsExecutionService.executeRules(Section.builder()
+                    .entities(entities)
                     .text(searchableText.getAsStringWithLinebreaks())
                     .searchText(searchableText.toString())
                     .headline(paragraph.getHeadline())
                     .sectionNumber(sectionNumber)
-                    .build(), searchableText));
+                    .build());
 
+            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
             sectionNumber++;
         }
 
-        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(sectionSearchableTextPair.getSection());
-            documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), sectionSearchableTextPair.getSearchableText(), dictionary));
+        for (Entity entity : documentEntities) {
+            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                        .add(entityPositionSequence);
+            }
 
-            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 -> {
+            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                classifiedDoc.getEntities()
+                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis()));
+            }
+        }
 
-                        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, Dictionary dictionary) {
+    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text) {
 
         removeEntitiesContainedInLarger(entities);
 
         for (Entity entity : entities) {
-            if (entity.getPositionSequences().isEmpty()) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
-                        .getType()), entity.getTargetSequences()));
+            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()));
             }
         }
 
@@ -226,8 +140,7 @@ public class EntityRedactionService {
     }
 
 
-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                     List<DictionaryModel> dictionary, boolean local) {
+    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber) {
 
         Set<Entity> found = new HashSet<>();
         String searchableString = searchableText.toString();
@@ -236,30 +149,25 @@ public class EntityRedactionService {
         }
 
         String lowercaseInputString = searchableString.toLowerCase();
-        for (DictionaryModel model : dictionary) {
-            if (model.isCaseInsensitive()) {
-                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionary().entrySet()) {
+            if (dictionaryService.getCaseInsensitiveTypes().contains(entry.getKey())) {
+                found.addAll(find(lowercaseInputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
             } else {
-                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+                found.addAll(find(searchableString, entry.getValue(), entry.getKey(), headline, sectionNumber));
             }
         }
+
         removeEntitiesContainedInLarger(found);
+
         return found;
 
     }
 
 
-    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
-                             boolean local) {
+    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber) {
 
         Set<Entity> found = new HashSet<>();
-
         for (String value : values) {
-
-            if (value.trim().length() <= 2) {
-                continue;
-            }
-
             int startIndex;
             int stopIndex = 0;
             do {
@@ -268,7 +176,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, !local));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber));
                 }
             } while (startIndex > -1);
         }
@@ -288,8 +196,7 @@ 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 && word
-                        .getSectionNumber() == inner.getSectionNumber()) {
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
                     wordsToRemove.add(inner);
                 }
             }
@@ -298,8 +205,7 @@ 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;

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

@@ -1,140 +0,0 @@
-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();
-    }
-
-}

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

@@ -1,12 +0,0 @@
-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} )+");
-
-}

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

@@ -11,7 +11,7 @@ public class TextNormalizationUtilities {
      * @return Text without line-break hyphenation.
      */
     public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
+        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
     }
 
 }

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

@@ -7,9 +7,12 @@ import lombok.Data;
 @Data
 @ConfigurationProperties("redaction-service")
 public class RedactionServiceSettings {
-    
-    private int numberOfSurroundingWords = 3;
 
-    private int surroundingWordsOffsetWindow = 100;
+    /**
+     * Tenant used in single tenant mode.
+     */
+    private String  defaultTenant = "iqser-id";
+
+    private int flattenImageDpi = 100;
 
 }

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

@@ -28,12 +28,4 @@ public abstract class AbstractTextContainer {
         return page == other.getPage() && this.minX <= other.getTopLeft().getX() && this.maxX >= other.getTopLeft().getX() + other.getWidth() && this.minY <= other.getTopLeft().getY()  && this.maxY >= other.getTopLeft().getY() + other.getHeight();
     }
 
-    public float getHeight() {
-        return maxY - minY;
-    }
-
-    public float getWidth() {
-        return maxX - minX;
-    }
-
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -42,13 +41,8 @@ public class Cell extends Rectangle {
 
         StringBuilder sb = new StringBuilder();
 
-
-        Iterator<TextBlock> itty = textBlocks.iterator();
-        TextPositionSequence previous = null;
-        while (itty.hasNext()) {
-
-            TextBlock textBlock = itty.next();
-
+        for (TextBlock textBlock : textBlocks) {
+            TextPositionSequence previous = null;
             for (TextPositionSequence word : textBlock.getSequences()) {
                 if (previous != null) {
                     if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
@@ -60,7 +54,6 @@ public class Cell extends Rectangle {
                 sb.append(word.toString());
                 previous = word;
             }
-
         }
 
         return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
@@ -68,8 +61,4 @@ public class Cell extends Rectangle {
                 .replaceAll(" {2}", " ");
     }
 
-
-
-
-
 }

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

@@ -30,14 +30,12 @@ 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;
                 }
             }
@@ -46,6 +44,7 @@ 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());
@@ -68,23 +67,25 @@ public class TableExtractionService {
             Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
             while (itty.hasNext()) {
                 AbstractTextContainer textBlock = itty.next();
-                if (table.contains(textBlock) && position == -1) {
-                    position = page.getTextBlocks().indexOf(textBlock);
+                if (table.contains(textBlock)) {
+                    if (position == -1) {
+                        position = page.getTextBlocks().indexOf(textBlock);
+                    }
+                    itty.remove();
                 }
             }
             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);
 

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

@@ -1,111 +0,0 @@
-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);
-    }
-
-}

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

@@ -1,6 +1,7 @@
 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;
 
@@ -12,29 +13,23 @@ 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 {
-            QuickSort.sort(list, comparator);
-        } catch (IllegalArgumentException e) {
-            // This should not happen since we use QuickSort from PDFBox
+            Collections.sort(list, comparator);
+        } catch (IllegalArgumentException e){
+            //TODO Figure out why this happens.
             log.warn(e.getMessage());
         }
-    }
+	}
 
 }

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

@@ -23,16 +23,13 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.apache.pdfbox.text.TextPosition;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.model.CellRectangle;
 import com.iqser.red.service.redaction.v1.model.Comment;
 import com.iqser.red.service.redaction.v1.model.IdRemoval;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionRectangle;
 import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
@@ -108,6 +105,7 @@ public class AnnotationHighlightService {
                 continue;
             }
 
+
             boolean requestedToRemove = false;
             List<Comment> comments = null;
 
@@ -172,6 +170,7 @@ public class AnnotationHighlightService {
                 }
             }
 
+
         }
 
     }
@@ -256,7 +255,6 @@ public class AnnotationHighlightService {
                 .manual(true)
                 .status(manualRedactionEntry.getStatus())
                 .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
                 .build();
     }
 
@@ -271,13 +269,9 @@ 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();
     }
 
@@ -406,7 +400,10 @@ public class AnnotationHighlightService {
         if (!entity.isRedaction() && !isHint(entity)) {
             return dictionaryService.getNotRedactedColor();
         }
-        return dictionaryService.getColor(entity.getType());
+        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
+            return dictionaryService.getDefaultColor();
+        }
+        return dictionaryService.getEntryColors().get(entity.getType());
     }
 
 
@@ -422,16 +419,18 @@ public class AnnotationHighlightService {
 
 
     private float[] getColor(String type) {
-        return dictionaryService.getColor(type);
+
+        if (!dictionaryService.getEntryColors().containsKey(type)) {
+            return dictionaryService.getDefaultColor();
+        }
+        return dictionaryService.getEntryColors().get(type);
     }
 
 
     private boolean isHint(Entity entity) {
-        return dictionaryService.isHint(entity.getType());
-    }
 
-    private boolean isRecommendation(Entity entity) {
-        return dictionaryService.isRecommendation(entity.getType());
+        List<String> hintTypes = dictionaryService.getHintTypes();
+        return CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType());
     }
 
 
@@ -453,27 +452,11 @@ public class AnnotationHighlightService {
                     continue;
                 }
                 if (textBlock instanceof TextBlock) {
-
                     textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
                     visualizeTextBlock((TextBlock) textBlock, contentStream);
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
-
                 } else if (textBlock instanceof Table) {
-
                     textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                    List<CellRectangle> cellRectangles = visualizeTable((Table) textBlock, contentStream);
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
-
+                    visualizeTable((Table) textBlock, contentStream);
                 }
             }
         }
@@ -499,9 +482,8 @@ public class AnnotationHighlightService {
     }
 
 
-    private List<CellRectangle> visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
+    private void visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
 
-        List<CellRectangle> cellRectangles = new ArrayList<>();
         for (List<Cell> row : table.getRows()) {
             for (Cell cell : row) {
 
@@ -511,8 +493,6 @@ public class AnnotationHighlightService {
                     contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
                             .getHeight());
                     contentStream.stroke();
-                    cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                            .getWidth(), (float) cell.getHeight()));
                 }
             }
         }
@@ -525,8 +505,6 @@ public class AnnotationHighlightService {
             contentStream.showText(table.getClassification());
             contentStream.endText();
         }
-
-        return cellRectangles;
     }
 
 }

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

@@ -0,0 +1,68 @@
+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;
+    }
+
+}

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

@@ -66,23 +66,14 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 public class RedactionIntegrationTest {
 
     private static final String RULES = loadFromClassPath("drools/rules.drl");
-    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 = "CBI_sponsor";
+    private static final String VERTEBRATES_CODE = "vertebrate";
+    private static final String ADDRESS_CODE = "address";
+    private static final String NAME_CODE = "name";
+    private static final String SPONSOR = "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";
     private static final String MUST_REDACT = "must_redact";
-    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
     private RedactionController redactionController;
@@ -97,7 +88,6 @@ 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
@@ -132,43 +122,37 @@ public class RedactionIntegrationTest {
         loadTypeForTest();
         when(dictionaryClient.getVersion()).thenReturn(0L);
         when(dictionaryClient.getAllTypes()).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE));
-        when(dictionaryClient.getDictionaryForType(ADDRESS)).thenReturn(getDictionaryResponse(ADDRESS));
-        when(dictionaryClient.getDictionaryForType(AUTHOR)).thenReturn(getDictionaryResponse(AUTHOR));
+        when(dictionaryClient.getDictionaryForType(VERTEBRATES_CODE)).thenReturn(getDictionaryResponse(VERTEBRATES_CODE));
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(getDictionaryResponse(ADDRESS_CODE));
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(getDictionaryResponse(NAME_CODE));
         when(dictionaryClient.getDictionaryForType(SPONSOR)).thenReturn(getDictionaryResponse(SPONSOR));
         when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
         when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
         when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
         when(dictionaryClient.getDictionaryForType(MUST_REDACT)).thenReturn(getDictionaryResponse(MUST_REDACT));
-        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);
     }
 
 
     private void loadDictionaryForTest() {
 
-        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_author.txt")
+        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/names.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
         dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
+                .addAll(ResourceLoader.load("dictionaries/sponsor_companies.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/vertebrate.txt")
+        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt")
+        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
@@ -192,36 +176,6 @@ public class RedactionIntegrationTest {
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(PUBLISHED_INFORMATION, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/published_information.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(TEST_METHOD, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/test_method.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(PII, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/PII.txt")
-                        .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()));
     }
 
 
@@ -233,65 +187,32 @@ public class RedactionIntegrationTest {
 
     private void loadTypeForTest() {
 
-        typeColorMap.put(VERTEBRATE, "#ff85f7");
-        typeColorMap.put(ADDRESS, "#ffe187");
-        typeColorMap.put(AUTHOR, "#ffe187");
-        typeColorMap.put(SPONSOR, "#85ebff");
-        typeColorMap.put(NO_REDACTION_INDICATOR, "#be85ff");
-        typeColorMap.put(REDACTION_INDICATOR, "#caff85");
-        typeColorMap.put(HINT_ONLY, "#abc0c4");
-        typeColorMap.put(MUST_REDACT, "#fab4c0");
-        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");
+        typeColorMap.put(VERTEBRATES_CODE, "#00ff00");
+        typeColorMap.put(ADDRESS_CODE, "#00ffff");
+        typeColorMap.put(NAME_CODE, "#ffff00");
+        typeColorMap.put(SPONSOR, "#2c21fc");
+        typeColorMap.put(NO_REDACTION_INDICATOR, "#e600ff");
+        typeColorMap.put(REDACTION_INDICATOR, "#ff7700");
+        typeColorMap.put(HINT_ONLY, "#00fcb1");
+        typeColorMap.put(MUST_REDACT, "#ff0000");
 
-        hintTypeMap.put(VERTEBRATE, true);
-        hintTypeMap.put(ADDRESS, false);
-        hintTypeMap.put(AUTHOR, false);
+        hintTypeMap.put(VERTEBRATES_CODE, true);
+        hintTypeMap.put(ADDRESS_CODE, false);
+        hintTypeMap.put(NAME_CODE, false);
         hintTypeMap.put(SPONSOR, false);
         hintTypeMap.put(NO_REDACTION_INDICATOR, true);
         hintTypeMap.put(REDACTION_INDICATOR, true);
         hintTypeMap.put(HINT_ONLY, true);
         hintTypeMap.put(MUST_REDACT, true);
-        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);
-        caseInSensitiveMap.put(AUTHOR, false);
+        caseInSensitiveMap.put(VERTEBRATES_CODE, true);
+        caseInSensitiveMap.put(ADDRESS_CODE, false);
+        caseInSensitiveMap.put(NAME_CODE, false);
         caseInSensitiveMap.put(SPONSOR, false);
         caseInSensitiveMap.put(NO_REDACTION_INDICATOR, true);
         caseInSensitiveMap.put(REDACTION_INDICATOR, true);
         caseInSensitiveMap.put(HINT_ONLY, true);
         caseInSensitiveMap.put(MUST_REDACT, true);
-        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");
@@ -309,7 +230,6 @@ 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());
@@ -323,7 +243,6 @@ public class RedactionIntegrationTest {
                 .entries(dictionary.get(type))
                 .isHint(hintTypeMap.get(type))
                 .isCaseInsensitive(caseInSensitiveMap.get(type))
-                .isRecommendation(recommendationTypeMap.get(type))
                 .build();
     }
 
@@ -331,7 +250,6 @@ 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");
@@ -357,10 +275,6 @@ public class RedactionIntegrationTest {
             });
         }
 
-        long end = System.currentTimeMillis();
-
-        System.out.println("duration: " + (end - start));
-
     }
 
 
@@ -396,12 +310,6 @@ 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());
         }
@@ -491,7 +399,7 @@ public class RedactionIntegrationTest {
     public void classificationTest() throws IOException {
 
         System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -527,7 +435,7 @@ public class RedactionIntegrationTest {
     public void htmlTablesTest() throws IOException {
 
         System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/line_breaks.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))

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

@@ -14,11 +14,8 @@ 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;
@@ -56,7 +53,7 @@ import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationSer
 public class EntityRedactionServiceTest {
 
     private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
-    private static final String AUTHOR_CODE = "author";
+    private static final String NAME_CODE = "name";
     private static final String ADDRESS_CODE = "address";
     private static final String SPONSOR_CODE = "sponsor";
 
@@ -104,8 +101,8 @@ public class EntityRedactionServiceTest {
     public void testNestedEntitiesRemoval() {
 
         Set<Entity> entities = new HashSet<>();
-        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);
+        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);
         entities.add(nested);
         entities.add(nesting);
         entityRedactionService.removeEntitiesContainedInLarger(entities);
@@ -129,17 +126,12 @@ public class EntityRedactionServiceTest {
                 .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                 .build();
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
 
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
-
         try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -162,15 +154,11 @@ public class EntityRedactionServiceTest {
                 .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                 .build();
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
 
         try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
@@ -188,17 +176,13 @@ public class EntityRedactionServiceTest {
                 " Supplement - Identity of the active substance - Reference list.pdf");
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/names.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -225,17 +209,13 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/names.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -260,32 +240,32 @@ public class EntityRedactionServiceTest {
                 "   when\n" +
                 "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
                 "   then\n" +
-                "       section.redactLineAfter(\"Name:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
                 " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Phone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Phone:\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Fax:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
                 "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
                 " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Tel:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
                 "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"E-mail:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Email:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Contact:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Fax number:\", \"address\", 6,true, \"Applicant information was found\"," +
+                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax number:\", \"address\", 6, \"Applicant information was found\"," +
                 " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactLineAfter(\"Telephone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6,true, \"Applicant information was found\", " +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6, \"Applicant information was found\", " +
                 "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
-                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
                 "   end";
         when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
         when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
@@ -294,17 +274,13 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/names.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -334,16 +310,8 @@ public class EntityRedactionServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        DictionaryResponse authorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse);
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor_companies.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -368,16 +336,12 @@ public class EntityRedactionServiceTest {
                 .build();
 
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
 
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -393,7 +357,7 @@ public class EntityRedactionServiceTest {
                 .build();
 
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
@@ -404,7 +368,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(9);
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(8);
         }
     }
 
@@ -419,16 +383,12 @@ public class EntityRedactionServiceTest {
                 .build();
 
         when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
 
-        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(Collections.emptyList())
-                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             entityRedactionService.processDocument(classifiedDoc, null);
@@ -449,7 +409,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\", false, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", \"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" +
@@ -458,7 +418,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\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", \"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" +
@@ -467,7 +427,7 @@ public class EntityRedactionServiceTest {
         when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
         TypeResponse typeResponse = TypeResponse.builder()
                 .types(Arrays.asList(
-                        TypeResult.builder().type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().type(NAME_CODE).hexColor("#ffff00").build(),
                         TypeResult.builder().type(ADDRESS_CODE).hexColor("#ff00ff").build(),
                         TypeResult.builder().type(SPONSOR_CODE).hexColor("#00ffff").build()))
                 .build();
@@ -477,7 +437,7 @@ public class EntityRedactionServiceTest {
         // Default empty return to prevent NPEs
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                 .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
@@ -513,28 +473,4 @@ 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);
-            }
-        }
-    }
-
 }

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

@@ -0,0 +1,17 @@
+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");
+    }
+
+}

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

@@ -10,11 +10,11 @@ public class TextNormalizationUtilitiesTest {
 
         String test = "Without these peo-\nple, this conference would not happen";
         Assertions.assertThat(TextNormalizationUtilities.removeHyphenLineBreaks(test))
-                .contains("people");
+                .contains("\npeople");
 
         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("einzelnen", "Vertrages");
+                .contains("\neinzelnen", "\nVertrages");
 
     }
 

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

@@ -1,10 +0,0 @@
-Long-term
-Brown liquid
-Brown solid
-Hand-held
-Manual-Hand held
-Manual-Hand held
-Weight:
-Sprague
-Weight and length
-Aeration: Gentle

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

@@ -0,0 +1 @@
+unpublished

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

@@ -0,0 +1,2 @@
+CTL
+determination of residues

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

@@ -1,4 +1,3 @@
-Fundamentals of Applied Toxicology
-in vitro
-in-vitro
 published paper
+in vitro
+in-vitro

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

@@ -1,87 +0,0 @@
-7th ed.; The Iowa State University Press: Ames, IA
-Analytical chemistry
-Animal Reproduction
-Animal Reproduction Science
-Apidologie
-Aquatic toxicology
-Archives of Environmental Contamination and Toxicology
-ATLA
-Atmospheric. Environment
-Australasian Journal of Ecotoxicology
-Background lesions of laboratory Animals, A Color Atlas
-Biometrics
-Biometrika
-Birth Defects Res. B. Dev. Reprod. Toxicol.
-Crit Rev Toxicol
-Current approaches in the statistical analysis of ecotoxicity data: guidance to application
-Curr. Med. Chem.
-Dongbei Nongye Daxue Xuebao
-Ecotoxicology and Environmental Safety
-Environ and Molecular Mutagenesis
-Environ. Health Perspec.
-Environ Health Perspect
-Environ Health Perspect.
-Environ Health Perspect. 1
-Environmental Health
-Environmental Health Perspectives
-Environmental & Molecular Mutagenesis
-Environmental Pollution
-Environmental Science
-Environmental Science and Technology.
-Environmental Science & Technology
-Environmental Toxicology and Chemistry
-Environ Mol Muta- gen
-Environ. Sci. Technol.
-Environ Toxicol.
-Env. Mol. Mutagen
-Erna¨hrung
-Essays in Honor of Harold Hotelling
-Fish Sci
-Food Cosmet. Toxicol.
-Fundamentals of Applied Toxicology
-Fundamentals of Applied Toxicology1988
-High-Throughput Screening Methods in Toxicity Testing
-High-Throughput Screening Methods in Toxicity Testing. Hoboken, NJ: John Wiley & Sons
-http://www.iobc-wprs.org
-Irish Journal of Agricultural and Food Research
-J Econom
-J Endocrinol
-J. Invest. Derm
-Journal of agricultural and food chemistry
-Journal of Applied Entomology
-Journal of Environmental Science and Health
-Journal of Experimental Biology and Ecology
-Journal of Hazardous Materials
-Journal of the American College of Toxicology
-Journal of Toxicology and
-J Steroid Biochem Mol Biol
-Marine Pollution Bulletin
-Middle Atlantic Reproduction and Teratology Association
-Mol. Cell. Endocrinol.
-Mol Mutagen
-Mutagenesis
-Mutat Res
-Nonparametric Statistics for the Behavioral Sciences
-Principles and Procedures of Statistics
-Principles and Procedures of Statistics, A Biometrical Approach
-Proc Natl Acad Sci USA
-Progress in
-Psychopharmacologia
-Reproductive Toxicology
-RNA
-Science of the Total Environment
-Stain Technol
-Statistical Methods
-Statistical Methods,
-Steinberg P,
-Teratology
-The American Statistician
-Toxicol Chem
-Toxicol in Vitro
-Toxicological and Environmental Chemistry
-Toxicological Sciences
-Toxicologic Pathology
-Toxicology and Applied Pharmacology
-Toxicol Sci
-Toxicol Sci.
-Toxicol Sci. 1

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

@@ -1,12 +1,9 @@
-acute toxicity
-acute-toxicity
-dermal penetration
-eco toxicity
-eco-toxicity
-Env. Mol. Mutagen,
 in vivo
 in-vivo
-ld
+dermal penetration
 oral toxicity
 oral-toxicity
-Processes & Impacts
+acute toxicity
+acute-toxicity
+eco toxicity
+eco-toxicity

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

@@ -1,8 +1,7 @@
-Crumrine
-Fine Organics Limited, Middlesbrough, United Kingdom
-Hunan Haili Chemical Industry Co., Ltd., Hunan, China
 Monthey Syngenta Crop Protection AG, Basel, Switzerland
 Syngenta Crop Protection, Monthey, Switzerland
+Fine Organics Limited, Middlesbrough, United Kingdom
 Syngenta Monthey Switzerland
-Syngenta Nantong, China
+Hunan Haili Chemical Industry Co., Ltd., Hunan, China
 Syngenta, Switzerland
+Syngenta Nantong, China

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

@@ -1,48 +0,0 @@
-Bartlett’s Test
-Bonferroni-Holm Adjustment
-Cochran-Armitage test
-Cochran-Armitage Trend Step-Down Test
-Dunnett's Multiple Comparison test
-Dunnett’s test
-Dunnett's "t" test
-Dunnett test
-Fisher Count-AllTM c
-Fisher Scientific Company
-Fisher’s Exact
-Fisher's exact test
-Fisher’s Exact Test
-Ham's F10
-Heinz body
-Heinz body determinations
-Jonckheere-Terpstra test (step-down)
-Jonckheere Trend Test
-Kay and Calandra system
-Klimisch code
-Kolmogorov-Smirnov's test
-Krebs cycle
-Litchfield and Wilcoxon method
-Magnusson and Kligman
-Magnusson & Kligman
-MAGNUSSON & KLINGMAN METHOD
-Mann-Whitney's test
-Maximisation test, Buehler
-Method of Magnusson and Kligman
-methodology validated at Smithers Viscient.
-n Williams' medium E a
-Patterson-Kelly twinshell blender
-Shapiro-Wilks and Levene’s tests
-Shapiro-Wilks’ Test
-Steel’s test
-Tamhane-Dunnett
-Tamhane-Dunnett test
-the method Davies
-Vogel-Bonner Medium E
-Welch’s test
-Welch t-test
-Whitney test
-Wilcoxon and Ansari-Bradley statistics
-Williams multiple sequential t-test
-Williams' test
-Williams t-test
-William test
-Winkler titration technique,

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

@@ -1,3 +1,4 @@
+a. sylvaticus
 african clawed frog
 agalychnis callidryas
 albino rat
@@ -14,7 +15,6 @@ apodemus flavicollis
 apodemus syl vaticus
 apodemus sylvaticus
 arvicola terrestris
-a. sylvaticus
 avian
 bank vole
 bird
@@ -23,7 +23,6 @@ bluegill
 bluegill sunfish
 bobwhite
 bobwhite quail
-Bovine
 brachydanio rerio
 brown hare
 bufo americanus
@@ -53,12 +52,10 @@ crocidura russula
 crucian carp
 cyprinodon variegatus
 cyprinus carpio
-(Danio rerio
 dog
 dogs
 duck
 ducks
-Environmental & Molecular Mutagenesis
 european brown hare
 european rabbit
 fathead minnow
@@ -124,13 +121,14 @@ myodes glareolus
 northern bobwhite
 o. cuniculus
 o. mykiss
+o. tshawytscha
 oncorhynchus
 oncorhynchus mykiss
 oncorhynchus tshawytscha
 oryctolagus cuniculus
 oryzias melastigma
 oryzias melastigma larvae
-o. tshawytscha
+p. promelas
 pagrus major
 palumbus
 pig
@@ -141,10 +139,10 @@ pimephales promela
 pimephales promelas
 poecilia reticulata
 poultry
-p. promelas
 pseudacris
 pseudacris triseriata
 quail
+r. catesbeiana
 rabbit
 rabbits
 rainbow trout
@@ -154,7 +152,6 @@ rana limnocharis
 rana pipiens
 rat
 rats
-r. catesbeiana
 reptile
 reptiles
 ricefish
@@ -171,7 +168,6 @@ sorex araneus
 spea multiplicata
 spotted march frog
 tadpoles
-Taeniopygia guttata
 terrestrial vertrebrates
 toad
 treefrog
@@ -191,6 +187,5 @@ wood pigeon
 xenopus laevis
 xenpous leavis
 yellow-necked mouse
-Zebra Finch
 zebra fish
-zebrafish
+zebrafish

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

@@ -5,14 +5,12 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Section
 global Section section
 
 
-// --------------------------------------- CBI rules -------------------------------------------------------------------
-
 rule "1: Redacted because Section contains Vertebrate"
 	when
 		Section(matchesType("vertebrate"))
 	then
-		section.redact("CBI_author", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("CBI_address", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("name", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end
 
 
@@ -20,8 +18,8 @@ rule "2: Not Redacted because Section contains no Vertebrate"
 	when
 		Section(!matchesType("vertebrate"))
 	then
-		section.redactNot("CBI_author", 2, "No Vertebrate found");
-		section.redactNot("CBI_address", 2, "No Vertebrate found");
+		section.redactNot("name", 2, "No Vertebrate found");
+		section.redactNot("address", 2, "No Vertebrate found");
 	end
 
 
@@ -29,8 +27,8 @@ rule "3: Do not redact Names and Addresses if no redaction Indicator is containe
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
 	then
-		section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
-		section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
+		section.redactNot("name", 3, "Vertebrate and No Redaction Indicator found");
+		section.redactNot("address", 3, "Vertebrate and No Redaction Indicator found");
 	end
 
 
@@ -38,8 +36,8 @@ rule "4: Do not redact Names and Addresses if no redaction Indicator is containe
 	when
 		Section(matchesType("vertebrate"), matchesType("published_information"))
 	then
-		section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
-		section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
+		section.redactNot("name", 4, "Vertebrate and Published Information found");
+		section.redactNot("address", 4, "Vertebrate and Published Information found");
 	end
 
 
@@ -47,207 +45,86 @@ rule "5: Redact Names and Addresses if no_redaction_indicator and redaction_indi
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
 	then
-		section.redact("CBI_author", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("CBI_address", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("name", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 5, "Vertebrate and Redaction Indicator found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end
 
 
-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", 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
-
-
-rule "7: Redact if must redact entry is found"
+rule "6: Redact contact information if applicant is found"
 	when
-		Section(matchesType("must_redact"))
+		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact"))
 	then
-		section.redact("CBI_author", 7, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("CBI_address", 7, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact point:",  "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Phone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Email:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("e-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail address:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Alternative contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone No:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Company:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("No:", "Fax", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Contact:", "Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end
 
 
-rule "8: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
-    when
-        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes"))
-    then
-        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
-
-
-rule "9: Redact sponsor company"
-    when
-        Section(searchText.toLowerCase().contains("batches produced at"))
-    then
-        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
-
-
-rule "10: Redact determination of residues"
-	when
-		Section(searchText.toLowerCase.contains("determination of residues") && (
-			searchText.toLowerCase.contains("livestock") ||
-			searchText.toLowerCase.contains("live stock") ||
-			searchText.toLowerCase.contains("tissue") ||
-			searchText.toLowerCase.contains("liver") ||
-			searchText.toLowerCase.contains("muscle") ||
-			searchText.toLowerCase.contains("bovine") ||
-			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)");
-		section.redact("CBI_address", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.addHintAnnotation("determination of residues", "must_redact");
-		section.addHintAnnotation("livestock", "must_redact");
-		section.addHintAnnotation("live stock", "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 "12: Redacted PII Personal Identification Information"
-	when
-		Section(matchesType("PII"))
-	then
-		section.redact("PII", 12, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-	end
-
-
-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", 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 "15: Redact contact information if Producer is found"
+rule "7: 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", 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)");
+		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Phone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("No:", "Fax", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end
 
 
-rule "16: Redact AUTHOR(S)"
+rule "8: Not redacted because Vertebrate Study = N"
     when
-        Section(searchText.contains("AUTHOR(S):"))
+        Section(rowEquals("Vertebrate study Y/N", "N") || rowEquals("Vertebrate study Y/N", "No"))
     then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 16, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactNotCell("Author(s)", 8, "name", "Not redacted because row is not a vertebrate study");
+        section.redactNot("address", 8, "Not redacted because row is not a vertebrate study");
+        section.highlightCell("Vertebrate study Y/N", 8, "hint_only");
     end
 
 
-rule "17: Redact PERFORMING LABORATORY"
+rule "9: Redact if must redact entry is found"
+	when
+		Section(matchesType("must_redact"))
+	then
+		section.redact("name", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+	end
+
+
+rule "10: Redact Authors and Addresses in Reference Table if it is a Vertebrate study"
     when
-        Section(searchText.contains("PERFORMING LABORATORY:"))
+        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes"))
     then
-        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 17, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactCell("Author(s)", 10, "name", "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("address", 10, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.highlightCell("Vertebrate study Y/N", 10, "must_redact");
     end
 
 
-rule "18: Redact On behalf of Sequani Ltd.:"
+rule "11: Redact sponsor company"
     when
-        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
+        Section(searchText.toLowerCase().contains("batches produced at"))
     then
-        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 "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", 19, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactIfPrecededBy("batches produced at", "sponsor", 11, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
     end