Revert idRemoval fix, removed duplicate code

Merge in RED/redaction-service from annotation-fix to master

* commit 'e3a960d0861bdfa96b90fe406eb825573007530e':
  idRemoval fix

bamboo-specs/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.0.4</version>
+    <version>7.1.2</version>
     <relativePath/>
   </parent>
 
@@ -34,4 +34,4 @@
 
   <!-- run 'mvn test' to perform offline validation of the plan -->
   <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>
+</project>

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("gin4", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                 .loggedInUserPermissions(PermissionType.VIEW)
                 .anonymousUserPermissionView();
         return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -134,4 +134,4 @@ public class PlanSpec {
                                 .whenInactiveInRepositoryAfterDays(14))
                         .notificationForCommitters());
     }
-}
+}

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

@@ -1,4 +1,4 @@
-FROM gin5/platform-base:5.2.0
+FROM red/base-image:1.0.0
 
 ARG PLATFORM_JAR
 
@@ -6,4 +6,13 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 
 ENV USES_ELASTICSEARCH false
 
-COPY ["${PLATFORM_JAR}", "/"]
+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/pom.xml

@@ -22,7 +22,7 @@
     </modules>
 
     <properties>
-        <pdfbox.version>2.0.16</pdfbox.version>
+        <pdfbox.version>2.0.21</pdfbox.version>
     </properties>
 
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.1.0</version>
+                <version>1.1.7</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

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

@@ -0,0 +1,16 @@
+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/Comment.java

@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment {
+
+    private String id;
+    private OffsetDateTime date;
+    private String text;
+    private String user;
+
+}

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

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IdRemoval {
+
+    private String id;
+    private String user;
+    private Status status;
+    private boolean removeFromDictionary;
+
+}

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

@@ -4,18 +4,25 @@ import java.util.ArrayList;
 import java.util.List;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 public class ManualRedactionEntry {
 
+    private String id;
+    private String user;
     private String type;
     private String value;
     private String reason;
+    private String legalBasis;
     private List<Rectangle> positions = new ArrayList<>();
+    private Status status;
+    private boolean addToDictionary;
 
     private String section;
     private int sectionNumber;

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ManualRedactionType {
+    ADD, REMOVE
+}

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

@@ -1,17 +1,29 @@
 package com.iqser.red.service.redaction.v1.model;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
 public class ManualRedactions {
 
-    private Set<String> idsToRemove = new HashSet<>();
+    @Builder.Default
+    private Set<IdRemoval> idsToRemove = new HashSet<>();
+
+    @Builder.Default
     private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
+
+    @Builder.Default
+    private Map<String, List<Comment>> comments = new HashMap<>();
+
 }

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

@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -14,7 +14,19 @@ public class RedactionLog {
     private List<RedactionLogEntry> redactionLogEntry;
 
     private long dictionaryVersion = -1;
-
     private long rulesVersion = -1;
 
+    private String ruleSetId;
+    private String filename;
+
+
+    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
+
+        this.redactionLogEntry = redactionLogEntry;
+        this.dictionaryVersion = dictionaryVersion;
+        this.rulesVersion = rulesVersion;
+        this.ruleSetId = ruleSetId;
+    }
+
+
 }

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

@@ -18,8 +18,11 @@ public class RedactionLogEntry {
     private String type;
     private String value;
     private String reason;
+    private int matchedRule;
+    private String legalBasis;
     private boolean redacted;
     private boolean isHint;
+    private boolean isRecommendation;
     private String section;
     private float[] color;
 
@@ -27,5 +30,11 @@ public class RedactionLogEntry {
     private List<Rectangle> positions = new ArrayList<>();
     private int sectionNumber;
     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/RedactionRequest.java

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 public class RedactionRequest {
 
     private byte[] document;
+    private String ruleSetId;
     private boolean flatRedaction;
     private ManualRedactions manualRedactions;
 }

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

@@ -14,5 +14,6 @@ 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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,33 @@
+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-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Status.java

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -1,16 +1,19 @@
 package com.iqser.red.service.redaction.v1.resources;
 
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 public interface RedactionResource {
 
     String SERVICE_NAME = "redaction-service-v1";
 
+    String RULE_SET_PARAMETER_NAME = "ruleSetId";
+    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
+
     @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
 
@@ -23,7 +26,10 @@ public interface RedactionResource {
     @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
 
-    @PostMapping(value = "/rules/update", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@RequestBody String rules);
+    @PostMapping(value = "/rules/update"+RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId);
+
+    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
+    void testRules(@RequestBody String rules);
 
 }

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

@@ -11,25 +11,6 @@
 
     <artifactId>redaction-service-server-v1</artifactId>
 
-    <properties>
-        <pdfbox.version>2.0.20</pdfbox.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox-tools</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
@@ -39,7 +20,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.0.12</version>
+            <version>2.0.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/Application.java

@@ -1,70 +1,26 @@
 package com.iqser.red.service.redaction.v1.server;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
 @Import({DefaultWebMvcConfiguration.class})
 @EnableFeignClients(basePackageClasses = RulesClient.class)
 @EnableConfigurationProperties(RedactionServiceSettings.class)
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, WebMvcMetricsAutoConfiguration.class})
 public class Application {
 
-    @Autowired
-    private RulesClient rulesClient;
-
-
     public static void main(String[] args) {
-
         SpringApplication.run(Application.class, args);
     }
 
 
-    @Bean
-    public KieContainer kieContainer() {
-
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            RulesResponse rules = rulesClient.getRules();
-            if (StringUtils.isEmpty(rules.getRules())) {
-                throw new RuntimeException("Rules cannot be empty.");
-            }
-            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
-                    .newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
-
-    }
-
 }

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

@@ -6,6 +6,7 @@ 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;
@@ -25,4 +26,7 @@ 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,13 +97,7 @@ 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() {
@@ -131,7 +125,7 @@ public class TextBlock extends AbstractTextContainer {
         TextPositionSequence previous = null;
         for (TextPositionSequence word : sequences) {
             if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                     sb.append('\n');
                 } else {
                     sb.append(' ');

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

@@ -5,15 +5,17 @@ import java.util.regex.Pattern;
 
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class ClassificationService {
@@ -28,7 +30,7 @@ public class ClassificationService {
 
         List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();
 
-        System.out.println(document.getFontSizeCounter().getCountPerValue());
+        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());
 
         for (Page page : document.getPages()) {
             Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
@@ -39,6 +41,7 @@ public class ClassificationService {
 
 
     public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+
         for (AbstractTextContainer textBlock : page.getTextBlocks()) {
             if (textBlock instanceof TextBlock) {
                 classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
@@ -47,24 +50,33 @@ public class ClassificationService {
     }
 
 
-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
+                              List<Float> headlineFontSizes) {
+
         if (document.getFontSizeCounter().getMostPopular() == null) {
             // TODO Figure out why this happens.
             return;
         }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
             textBlock.setClassification("Header");
 
-        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
             textBlock.setClassification("Footer");
-        }  else if (page.getPageNumber() == 1
-                && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock)
-                && PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks().size() == 1)) {
+        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
+                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
+                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
+                .getMostPopular() || page.getTextBlocks().size() == 1)) {
             if (!Pattern.matches("[0-9]+", textBlock.toString())) {
                 textBlock.setClassification("Title");
             }
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter().getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {
 
             for (int i = 1; i <= headlineFontSizes.size(); i++) {
                 if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -72,20 +84,34 @@ public class ClassificationService {
                     document.setHeadlines(true);
                 }
             }
-        }else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
+                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
             textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
             document.setHeadlines(true);
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
             textBlock.setClassification("TextBlock Bold");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont().equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle().equals(document.getFontStyleCounter().getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular()) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
+                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
+                .equals(document.getFontStyleCounter()
+                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular()) {
             textBlock.setClassification("TextBlock");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("italic") && !document.getFontStyleCounter().getMostPopular().equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("italic") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
             textBlock.setClassification("TextBlock Italic");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getSequences().size() > 3){
+        } 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/client/DictionaryClient.java

@@ -1,10 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }

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

@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
 }

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

@@ -1,34 +1,34 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
 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;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
@@ -37,9 +37,8 @@ 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,22 +47,30 @@ public class RedactionController implements RedactionResource {
             pdDocument.setAllSecurityToBeRemoved(true);
 
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest.getManualRedactions());
 
-            if (redactionRequest.isFlatRedaction()) {
-                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
-                return convert(flatDocument, classifiedDoc.getPages().size(), classifiedDoc.getRedactionLogEntities());
-            }
+            log.info("Document structure analysis successful, starting redaction analysis...");
 
-            return convert(pdDocument, classifiedDoc.getPages().size(), classifiedDoc.getRedactionLogEntities());
+            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getRuleSetId(), redactionRequest.getManualRedactions());
+            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
+                    .getManualRedactions(), redactionRequest.getRuleSetId());
 
-        } catch (IOException e) {
+            log.info("Redaction analysis successful...");
+
+            return convert(pdDocument,
+                    classifiedDoc.getPages().size(),
+                    classifiedDoc.getRedactionLogEntities(),
+                    classifiedDoc.getSectionGrid(),
+                    classifiedDoc.getDictionaryVersion(),
+                    classifiedDoc.getRulesVersion(),
+                    redactionRequest.getRuleSetId());
+
+        } catch (Exception e) {
             throw new RedactionException(e);
         }
 
     }
 
+
     @Override
     public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
 
@@ -73,7 +80,7 @@ public class RedactionController implements RedactionResource {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
 
-            return convert(pdDocument, classifiedDoc.getPages().size());
+            return convert(pdDocument, classifiedDoc.getPages().size(), pdfSegmentationRequest.getRuleSetId());
 
         } catch (IOException e) {
             throw new RedactionException(e);
@@ -81,6 +88,7 @@ public class RedactionController implements RedactionResource {
 
     }
 
+
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
 
@@ -90,7 +98,7 @@ public class RedactionController implements RedactionResource {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
             pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
 
-            return convert(pdDocument, classifiedDoc.getPages().size());
+            return convert(pdDocument, classifiedDoc.getPages().size(), redactionRequest.getRuleSetId());
 
         } catch (IOException e) {
             throw new RedactionException(e);
@@ -98,6 +106,7 @@ public class RedactionController implements RedactionResource {
 
     }
 
+
     @Override
     public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {
 
@@ -124,24 +133,35 @@ public class RedactionController implements RedactionResource {
 
     }
 
+
     @Override
-    public void updateRules(@RequestBody String rules) {
-        droolsExecutionService.updateRules(rules);
+    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
+        droolsExecutionService.updateRules(ruleSetId);
+    }
+
+    @Override
+    public void testRules(@RequestBody String rules) {
+        droolsExecutionService.testRules(rules);
     }
 
 
-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-        return convert(document, numberOfPages, null);
+    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {
+
+        return convert(document, numberOfPages, null, null, 0, 0, ruleSetId);
     }
 
-    private RedactionResult convert(PDDocument document, int numberOfPages, List<RedactionLogEntry> redactionLogEntities) throws IOException {
+
+    private RedactionResult convert(PDDocument document, int numberOfPages,
+                                    List<RedactionLogEntry> redactionLogEntities,
+                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
             document.save(byteArrayOutputStream);
             return RedactionResult.builder()
                     .document(byteArrayOutputStream.toByteArray())
                     .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities,  dictionaryService.getDictionaryVersion(), droolsExecutionService.getRulesVersion()))
+                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
+                    .sectionGrid(sectionGrid)
                     .build();
         }
 

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

@@ -44,10 +44,10 @@ import lombok.extern.slf4j.Slf4j;
 public class PDFLinesTextStripper extends PDFTextStripper {
 
     @Getter
-    private float minCharWidth = Float.MAX_VALUE;
+    private int maxCharWidths;
 
     @Getter
-    private float minCharHeight = Float.MAX_VALUE;
+    private int maxCharHeight;
 
     @Getter
     private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
@@ -201,10 +201,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
         int startIndex = 0;
         for (int i = 0; i <= textPositions.size() - 1; i++) {
-            minCharWidth = Math.min(minCharWidth, textPositions.get(i).getWidthDirAdj());
-            minCharHeight = Math.min(minCharHeight, textPositions.get(i).getHeightDir());
 
-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            int charHeight = (int) textPositions.get(i).getHeightDir();
+            if(charHeight > maxCharHeight){
+                maxCharHeight = charHeight;
+            }
+
+            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
+            if(charWidth > maxCharWidths){
+                maxCharWidths = charWidth;
+            }
+
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
                 startIndex++;
                 continue;
             }
@@ -212,15 +220,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             // Strange but sometimes this is happening, for example: Metolachlor2.pdf
             if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
             }
 
-            if (i > 0 && textPositions.get(i).getUnicode().equals(" ") && i <= textPositions.size() - 2) {
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0")) && i <= textPositions.size() - 2) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i + 1;
@@ -228,21 +236,20 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         }
 
         List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && sublist.get(sublist.size() - 1).getUnicode().equals(" ")) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
             sublist = sublist.subList(0, sublist.size() - 1);
         }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
             textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
         }
         super.writeString(text);
-
     }
 
     @Override
     public String getText(PDDocument doc) throws IOException {
 
-        minCharWidth = Float.MAX_VALUE;
-        minCharHeight = Float.MAX_VALUE;
+        maxCharWidths = 0;
+        maxCharWidths = 0;
         textPositionSequences.clear();
         rulings.clear();
         graphicsPath.clear();

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

@@ -17,6 +17,6 @@ public class ParsedElements {
     private boolean landscape;
     private boolean rotated;
 
-    private float minCharWidth;
-    private float minCharHeight;
+    private float maxCharWidth;
+    private float maxCharHeight;
 }

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

@@ -9,9 +9,7 @@ import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 
 import lombok.Data;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;
 
 @Data
 @RequiredArgsConstructor
@@ -19,10 +17,6 @@ public class TextPositionSequence implements CharSequence {
 
     private List<TextPosition> textPositions = new ArrayList<>();
 
-    @Getter
-    @Setter
-    private float[] annotationColor;
-
     private final int page;
 
 
@@ -107,6 +101,9 @@ public class TextPositionSequence implements CharSequence {
         }
     }
 
+    public float getRotationAdjustedY() {
+        return textPositions.get(0).getY();
+    }
 
     public float getY1() {
 
@@ -194,22 +191,18 @@ public class TextPositionSequence implements CharSequence {
 
     public Rectangle getRectangle() {
 
-        float height = textPositions.get(0).getHeightDir() + 2;
+        float height = getTextHeight();
 
-        float posXInit;
+        float posXInit = getX1();
         float posXEnd;
         float posYInit;
         float posYEnd;
 
         if (textPositions.get(0).getRotation() == 90) {
-
             posXEnd = textPositions.get(0).getYDirAdj() + 2;
-            posXInit = textPositions.get(0).getYDirAdj() - height;
-            posYInit = textPositions.get(0).getXDirAdj();
+            posYInit = getY1();
             posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
         } else {
-
-            posXInit = textPositions.get(0).getXDirAdj();
             posXEnd = textPositions.get(textPositions.size() - 1)
                     .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
             posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
@@ -220,4 +213,5 @@ public class TextPositionSequence implements CharSequence {
         return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, 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,16 +1,50 @@
 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;
 
-import lombok.RequiredArgsConstructor;
 import lombok.Value;
 
 @Value
-@RequiredArgsConstructor
 public class CellValue {
 
-    TextBlock textBlock;
+    private List<TextBlock> textBlocks;
 
-    int rowSpanStart;
+    private int rowSpanStart;
+
+
+    @Override
+    public String toString() {
+
+        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(' ');
+                    }
+                }
+                sb.append(word.toString());
+                previous = word;
+            }
+            if (itty.hasNext()) {
+                sb.append(' ');
+            }
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
+                .replaceAll("\n", " ")
+                .replaceAll(" {2}", " ");
+    }
 
 }

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

@@ -0,0 +1,88 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+public class Dictionary {
+
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+    @Getter
+    private long version;
+
+
+    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+        this.dictionaryModels = dictionaryModels;
+        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
+        this.version = dictionaryVersion;
+    }
+
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public boolean hasLocalEntries() {
+
+        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
+    }
+
+
+    public Set<String> getTypes() {
+
+        return localAccessMap.keySet();
+    }
+
+
+    public boolean containsValue(String type, String value) {
+
+        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getLocalEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getLocalEntries()
+                .contains(value)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+
+import java.io.Serializable;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryModel implements Serializable {
+
+    private String type;
+    private int rank;
+    private float[] color;
+    private boolean caseInsensitive;
+    private boolean hint;
+    private boolean recommendation;
+    private Set<String> entries;
+    private Set<String> localEntries;
+
+    public Set<String> getValues(boolean local){
+        return local ? localEntries : entries;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class DictionaryRepresentation {
+
+    private String ruleSetId;
+    private long dictionaryVersion = -1;
+    private List<DictionaryModel> dictionary = new ArrayList<>();
+    private float[] defaultColor;
+    private float[] requestAddColor;
+    private float[] requestRemoveColor;
+    private float[] notRedactedColor;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+
+
+}

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

@@ -12,14 +12,18 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity {
 
-    @EqualsAndHashCode.Include
+
     private final String word;
     private final String type;
     private boolean redaction;
     private String redactionReason;
+    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
@@ -29,8 +33,13 @@ public class Entity {
     @EqualsAndHashCode.Include
     private int sectionNumber;
 
+    private boolean isDictionaryEntry;
 
-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber) {
+    private String textBefore;
+    private String textAfter;
+
+
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter) {
 
         this.word = word;
         this.type = type;
@@ -40,10 +49,14 @@ public class Entity {
         this.headline = headline;
         this.matchedRule = matchedRule;
         this.sectionNumber = sectionNumber;
+        this.legalBasis = legalBasis;
+        this.isDictionaryEntry = isDictionaryEntry;
+        this.textBefore = textBefore;
+        this.textAfter = textAfter;
     }
 
 
-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {
 
         this.word = word;
         this.type = type;
@@ -51,6 +64,7 @@ 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/SearchableText.java

@@ -136,9 +136,11 @@ public class SearchableText {
 
     private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts) {
 
-        String id = IdBuilder.buildId(crossSequenceParts);
+        String plainId = IdBuilder.buildId(crossSequenceParts);
+        String id = plainId;
         List<EntityPositionSequence> result = new ArrayList<>();
         int currentPage = -1;
+        int idDiffentPageSuffix = 1;
         EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
         for (TextPositionSequence textPositionSequence : crossSequenceParts) {
             if (currentPage == -1) {
@@ -148,9 +150,13 @@ public class SearchableText {
             } else if (currentPage == textPositionSequence.getPage()) {
                 entityPositionSequence.getSequences().add(textPositionSequence);
             } else {
+                id = plainId + "-" + idDiffentPageSuffix;
+                idDiffentPageSuffix++;
                 result.add(entityPositionSequence);
                 entityPositionSequence = new EntityPositionSequence(id);
                 entityPositionSequence.setPageNumber(textPositionSequence.getPage());
+                entityPositionSequence.getSequences().add(textPositionSequence);
+                currentPage = textPositionSequence.getPage();
             }
         }
         result.add(entityPositionSequence);
@@ -173,7 +179,7 @@ public class SearchableText {
         for (TextPositionSequence word : sequences) {
 
             if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                     sb.append('\n');
                 } else {
                     sb.append(' ');
@@ -197,7 +203,7 @@ public class SearchableText {
         for (TextPositionSequence word : sequences) {
 
             if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                     sb.append('\n');
                 } else {
                     sb.append(' ');

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

@@ -1,14 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import java.util.ArrayList;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +26,13 @@ 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.
@@ -32,18 +47,22 @@ public class Section {
 
     private Map<String, CellValue> tabularData;
 
+    private Dictionary dictionary;
 
-    public boolean rowEquals(String headerName, String value){
-        String cleanHeaderName = headerName.replaceAll("\n", "")
-                .replaceAll(" ", "")
-                .replaceAll("-", "");
+    private SearchableText searchableText;
 
-        return tabularData != null && tabularData.containsKey(cleanHeaderName)
-                && tabularData.get(cleanHeaderName).getTextBlock().getText().equals(value);
+
+    public boolean rowEquals(String headerName, String value) {
+
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+
+        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
+                .toString()
+                .equals(value);
     }
 
 
-    public boolean contains(String type) {
+    public boolean matchesType(String type) {
 
         return entities.stream().anyMatch(entity -> entity.getType().equals(type));
     }
@@ -55,13 +74,17 @@ public class Section {
     }
 
 
-    public void redact(String type, int ruleNumber, String reason) {
+    public void redact(String type, int ruleNumber, String reason, String legalBasis) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
 
         entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                 entity.setRedaction(true);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
             }
         });
     }
@@ -69,8 +92,11 @@ public class Section {
 
     public void redactNot(String type, int ruleNumber, String reason) {
 
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
         entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                 entity.setRedaction(false);
                 entity.setMatchedRule(ruleNumber);
                 entity.setRedactionReason(reason);
@@ -79,118 +105,231 @@ public class Section {
     }
 
 
-    public void redactLineAfter(String start, String asType, int ruleNumber, String reason) {
+    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    public void addHintAnnotation(String value, String asType) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
+        addNewerToEntities(found);
+    }
+
+
+    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, 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);
-                    entities.addAll(found);
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    addNewerToEntities(found);
                 }
             }
         }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-            }
-        });
-
     }
 
 
-    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason) {
+    public void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis) {
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                addNewerToEntities(found);
+            }
+        }
+    }
+
+
+    public void addRecommendationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>())
+                        .add(match);
+            }
+        }
+    }
+
+
+    public void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
+                              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);
-                    entities.addAll(found);
+
+                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                    addNewerToEntities(found);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
                 }
             }
         }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-            }
-        });
     }
 
 
-    private Set<Entity> findEntities(String value, String asType) {
+    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber,
+                                   boolean redactEverywhere,
+                                   String reason, String legalBasis) {
 
-        Set<Entity> found = new HashSet<>();
+        String[] values = StringUtils.substringsBetween(text, start, stop);
 
-        int startIndex;
-        int stopIndex = 0;
-        do {
-            startIndex = searchText.indexOf(value, stopIndex);
-            stopIndex = startIndex + value.length();
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    String[] lines = value.split("\n");
 
-            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);
+                    for (String line : lines) {
 
-        return removeEntitiesContainedInLarger(found);
-    }
+                        if (line.trim().length() <= 2) {
+                            return;
+                        }
 
+                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                        addNewerToEntities(found);
 
-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
-    public Set<Entity> removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        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) {
-                    wordsToRemove.add(inner);
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
+                        }
+                    }
                 }
             }
         }
-        entities.removeAll(wordsToRemove);
-        return entities;
     }
 
 
     public void highlightCell(String cellHeader, int ruleNumber, String type) {
 
-        String cleanHeaderName = cellHeader.replaceAll("\n", "")
-                .replaceAll(" ", "")
-                .replaceAll("-", "");
+        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
+    }
+
+
+    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String
+            reason,
+                           String legalBasis) {
+
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+    }
+
+
+    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
+                              String reason) {
+
+        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
+    }
+
+
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted,
+                                     int ruleNumber, String reason, String legalBasis) {
+
+        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
+        String searchValue = caseInsensitive ? value.toLowerCase() : value;
+
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true);
+
+        found.forEach(entity -> {
+            if (redacted) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
+    }
+
+
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
+                              boolean addAsRecommendations, String reason, String legalBasis) {
+
+        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
 
         CellValue value = tabularData.get(cleanHeaderName);
         if (value == null) {
             log.warn("Could not find any data for {}.", cellHeader);
         } else {
-            Entity entity = new Entity(value.getTextBlock()
-                    .getText(), type, value.getRowSpanStart(), value.getRowSpanStart() + value.getTextBlock()
-                    .getText()
-                    .length(), headline, sectionNumber);
-            entity.setRedaction(false);
-            entity.setMatchedRule(ruleNumber);
-            entity.setRedactionReason(cellHeader);
-            entity.setTargetSequences(value.getTextBlock().getSequences()); // Make sure no other cells with same content are highlighted
-            entities.add(entity);
-        }
+            String word = value.toString();
 
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
+            entity.setRedaction(redact);
+            entity.setMatchedRule(ruleNumber);
+            entity.setRedactionReason(reason);
+            entity.setTargetSequences(value.getTextBlocks()
+                    .stream()
+                    .map(TextBlock::getSequences)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
+            entity.setLegalBasis(legalBasis);
+
+            Set<Entity> singleEntitySet = new HashSet<>();
+            singleEntitySet.add(entity);
+            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary);
+
+            addNewerToEntities(entity);
+
+            EntitySearchUtils.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);
+                    }
+                }
+            }
+        }
+    }
+
+
+    private void addNewerToEntities(Set<Entity> found) {
+        // HashSet keeps the older value, but we want the new only.
+        entities.removeAll(found);
+        entities.addAll(found);
+    }
+
+    private void addNewerToEntities(Entity found) {
+        // HashSet keeps the older value, but we want the new only.
+        entities.remove(found);
+        entities.add(found);
     }
 
 }
+
+
+
+
+
+

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

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SectionSearchableTextPair {
+
+    private Section section;
+    private SearchableText searchableText;
+
+}

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

@@ -1,6 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.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 com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;
+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.SerializationUtils;
+import org.springframework.stereotype.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;
@@ -8,74 +24,59 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-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 feign.FeignException;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
+@Slf4j
 @Service
 @RequiredArgsConstructor
-@Slf4j
 public class DictionaryService {
 
+
     private final DictionaryClient dictionaryClient;
 
-    @Getter
-    private long dictionaryVersion = -1;
 
-    @Getter
-    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;
+    private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();
 
 
-    public void updateDictionary() {
+    public void updateDictionary(String ruleSetId) {
 
-        long version = dictionaryClient.getVersion();
-        if (version > dictionaryVersion) {
-            dictionaryVersion = version;
-            updateDictionaryEntry();
+        long version = dictionaryClient.getVersion(ruleSetId);
+
+        var foundDictionary = dictionariesByRuleSets.get(ruleSetId);
+
+        if (foundDictionary == null || version > foundDictionary.getDictionaryVersion()) {
+            updateDictionaryEntry(ruleSetId, version);
         }
     }
 
 
-    private void updateDictionaryEntry() {
+    private void updateDictionaryEntry(String ruleSetId, long version) {
 
         try {
-            TypeResponse typeResponse = dictionaryClient.getAllTypes();
+            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();
+
+            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId);
             if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
-                entryColors = typeResponse.getTypes()
+
+                List<DictionaryModel> dictionary = typeResponse.getTypes()
                         .stream()
-                        .collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
-                hintTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isHint)
-                        .map(TypeResult::getType)
+                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
-                caseInsensitiveTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isCaseInsensitive)
-                        .map(TypeResult::getType)
-                        .collect(Collectors.toList());
-                dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, this::convertEntries));
-                defaultColor = dictionaryClient.getDefaultColor().getColor();
+
+
+                dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));
+
+                Colors colors = dictionaryClient.getColors(ruleSetId);
+
+                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
+                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
+                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
+                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
+                dictionaryRepresentation.setRuleSetId(ruleSetId);
+                dictionaryRepresentation.setDictionaryVersion(version);
+                dictionaryRepresentation.setDictionary(dictionary);
+
+                dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
             }
         } catch (FeignException e) {
             log.warn("Got some unknown feignException", e);
@@ -84,15 +85,100 @@ public class DictionaryService {
     }
 
 
-    private Set<String> convertEntries(String s) {
-        if (caseInsensitiveTypes.contains(s)) {
-            return dictionaryClient.getDictionaryForType(s)
+    public void updateExternalDictionary(Dictionary dictionary, String ruleSetId) {
+        dictionary.getDictionaryModels().forEach(dm -> {
+            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
+                dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion(ruleSetId);
+                if (externalVersion == dictionary.getVersion() + 1) {
+                    dictionary.setVersion(externalVersion);
+                }
+            }
+        });
+    }
+
+
+    private Set<String> convertEntries(TypeResult t) {
+
+        if (t.isCaseInsensitive()) {
+            return dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId())
                     .getEntries()
                     .stream()
                     .map(String::toLowerCase)
                     .collect(Collectors.toSet());
+        } else {
+            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId()).getEntries());
         }
-        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
     }
 
+
+    private float[] convertColor(String hex) {
+
+        Color color = Color.decode(hex);
+        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
+    }
+
+
+    public boolean isCaseInsensitiveDictionary(String type, String ruleSetId) {
+
+        DictionaryModel dictionaryModel = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+
+    public float[] getColor(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.getColor();
+        }
+        return dictionariesByRuleSets.get(ruleSetId).getDefaultColor();
+    }
+
+
+    public boolean isHint(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isRecommendation(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public Dictionary getDeepCopyDictionary(String ruleSetId) {
+        List<DictionaryModel> copy = new ArrayList<>();
+
+        var representation = dictionariesByRuleSets.get(ruleSetId);
+        var dictionary = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        dictionary.forEach(dm -> {
+            copy.add(SerializationUtils.clone(dm));
+        });
+
+        return new Dictionary(copy, representation.getDictionaryVersion());
+    }
+
+    public float[] getRequestRemoveColor(String ruleSetId) {
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
+    }
+
+    public float[] getNotRedactedColor(String ruleSetId) {
+        return dictionariesByRuleSets.get(ruleSetId).getNotRedactedColor();
+    }
+
+    public float[] getRequestAddColor(String ruleSetId) {
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
@@ -11,15 +13,13 @@ import org.kie.api.builder.KieFileSystem;
 import org.kie.api.builder.KieModule;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -27,13 +27,22 @@ public class DroolsExecutionService {
 
     private final RulesClient rulesClient;
 
-    @Autowired
-    private KieContainer kieContainer;
+    private Map<String, KieContainer> kieContainers = new HashMap<>();
+
+    public KieContainer getKieContainer(String ruleSetId) {
+        KieContainer container = kieContainers.get(ruleSetId);
+        if (container == null) {
+            return createOrUpdateKieContainer(ruleSetId);
+        } else {
+            return container;
+        }
+    }
+
 
     @Getter
     private long rulesVersion = -1;
 
-    public Section executeRules(Section section) {
+    public Section executeRules(KieContainer kieContainer, Section section) {
 
         KieSession kieSession = kieContainer.newKieSession();
         kieSession.setGlobal("section", section);
@@ -45,34 +54,60 @@ public class DroolsExecutionService {
 
     }
 
-    public void updateRules() {
+    public KieContainer updateRules(String ruleSetId) {
 
-        long version = rulesClient.getVersion();
+        long version = rulesClient.getVersion(ruleSetId);
         if (version > rulesVersion) {
             rulesVersion = version;
-            updateRules(rulesClient.getRules().getRules());
+            return createOrUpdateKieContainer(ruleSetId);
         }
+        return getKieContainer(ruleSetId);
 
     }
 
-    public void updateRules(String drlAsString) {
+    private KieContainer createOrUpdateKieContainer(String ruleSetId) {
 
         try {
-            if (StringUtils.isEmpty(drlAsString)) {
+
+            RulesResponse rules = rulesClient.getRules(ruleSetId);
+            if (rules == null || StringUtils.isEmpty(rules.getRules())) {
                 throw new RuntimeException("Rules cannot be empty.");
             }
+
             KieServices kieServices = KieServices.Factory.get();
-            InputStream input = new ByteArrayInputStream(drlAsString.getBytes(StandardCharsets.UTF_8));
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-            kieContainer.updateToVersion(kieModule.getReleaseId());
+            KieModule kieModule = getKieModule(ruleSetId, rules.getRules(), kieServices);
+
+            var container = kieContainers.get(ruleSetId);
+            if (container != null) {
+                container.updateToVersion(kieModule.getReleaseId());
+                return container;
+            }
+
+            container = kieServices.newKieContainer(kieModule.getReleaseId());
+            kieContainers.put(ruleSetId, container);
+            return container;
         } catch (Exception e) {
             throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
         }
 
     }
 
+    private KieModule getKieModule(String ruleSetId, String rules, KieServices kieServices) {
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        InputStream input = new ByteArrayInputStream(rules.getBytes(StandardCharsets.UTF_8));
+        kieFileSystem.write("src/main/resources/drools/rules" + ruleSetId + ".drl", kieServices.getResources()
+                .newInputStreamResource(input));
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+        kieBuilder.buildAll();
+        return kieBuilder.getKieModule();
+    }
+
+
+    public void testRules(String rules) {
+        KieServices kieServices = KieServices.Factory.get();
+        KieModule kieModule = getKieModule("test-rules", rules, kieServices);
+        var container = kieServices.newKieContainer(kieModule.getReleaseId());
+        container.newKieSession();
+        container.dispose();
+    }
 }

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

@@ -6,10 +6,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
@@ -19,10 +22,14 @@ 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.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 
@@ -36,75 +43,35 @@ public class EntityRedactionService {
 
     private final DictionaryService dictionaryService;
     private final DroolsExecutionService droolsExecutionService;
+    private final SurroundingWordsService surroundingWordsService;
 
 
-    public void processDocument(Document classifiedDoc, ManualRedactions manualRedactions) {
+    public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions) {
 
-        dictionaryService.updateDictionary();
-        droolsExecutionService.updateRules();
+        dictionaryService.updateDictionary(ruleSetId);
+        KieContainer container = droolsExecutionService.updateRules(ruleSetId);
+        long rulesVersion = droolsExecutionService.getRulesVersion();
 
-        Set<Entity> documentEntities = new HashSet<>();
-        int sectionNumber = 1;
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId);
 
-            SearchableText searchableText = paragraph.getSearchableText();
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));
 
-            List<Table> tables = paragraph.getTables();
+        if (dictionary.hasLocalEntries()) {
 
-            for (Table table : tables) {
-                for (List<Cell> row : table.getRows()) {
-                    SearchableText searchableRow = new SearchableText();
-                    Map<String, CellValue> tabularData = new HashMap<>();
-                    int start = 0;
-                    for (Cell cell : row) {
-                        if (cell.isHeaderCell() || CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                            continue;
-                        }
-                        addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber);
-                        int cellStart = start;
-                        cell.getHeaderCells().forEach(headerCell -> {
-                            StringBuilder headerBuilder = new StringBuilder();
-                            headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                            String headerName = headerBuilder.toString()
-                                    .replaceAll("\n", "")
-                                    .replaceAll(" ", "")
-                                    .replaceAll("-", "");
-                            tabularData.put(headerName, new CellValue(cell.getTextBlocks().get(0), cellStart));
-                        });
-                        start = start + cell.getTextBlocks().get(0).toString().length();
-                        for (TextBlock textBlock : cell.getTextBlocks()) {
-                            searchableRow.addAll(textBlock.getSequences());
-                        }
-                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber);
-
-                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
-                            .entities(rowEntities)
-                            .text(searchableRow.getAsStringWithLinebreaks())
-                            .searchText(searchableRow.toString())
-                            .headline(table.getHeadline())
-                            .sectionNumber(sectionNumber)
-                            .tabularData(tabularData)
-                            .build());
-
-                    documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), searchableRow));
-                    sectionNumber++;
+            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);
                 }
-                sectionNumber++;
-            }
+            });
 
-            addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            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());
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            // HashSet keeps the older value, but we want the new only.
+            documentEntities.removeAll(foundByLocal);
+            documentEntities.addAll(foundByLocal);
 
-            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
-            sectionNumber++;
+            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
         }
 
         for (Entity entity : documentEntities) {
@@ -118,95 +85,222 @@ public class EntityRedactionService {
                 classifiedDoc.getEntities()
                         .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                         .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber()));
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter()));
             }
         }
 
+        dictionaryService.updateExternalDictionary(dictionary, ruleSetId);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
     }
 
 
-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text) {
+    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
+                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {
 
-        removeEntitiesContainedInLarger(entities);
+        Set<Entity> documentEntities = new HashSet<>();
 
-        for (Entity entity : entities) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entity.getType())) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), true, entity.getTargetSequences()));
-            } else {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), false, entity.getTargetSequences()));
+        AtomicInteger sectionNumber = new AtomicInteger(1);
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+
+            List<Table> tables = paragraph.getTables();
+            for (Table table : tables) {
+                if (table.getColCount() == 2) {
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                } else {
+                    sectionSearchableTextPairs.addAll(processTablePerRow(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                }
+                sectionNumber.incrementAndGet();
+            }
+            sectionSearchableTextPairs.add(processText(paragraph, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
+        }
+
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            documentEntities.addAll(analysedRowSection.getEntities());
+
+            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+                if (dictionary.isRecommendation(key)) {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                        if (!dictionary.containsValue(key, value)) {
+                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                        }
+                    });
+                } else {
+                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+
+                        if (dictionary.getLocalAccessMap().get(key) == null) {
+                            log.warn("Dictionary {} is null", key);
+                        }
+
+                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                            log.warn("Dictionary {} localEntries is null", key);
+                        }
+
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    });
+                }
+            });
+
+        });
+
+        return documentEntities;
+    }
+
+
+    private List<SectionSearchableTextPair> processTablePerRow(Table table, ManualRedactions manualRedactions,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary,
+                                                               boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (List<Cell> row : table.getRows()) {
+            SearchableText searchableRow = new SearchableText();
+            Map<String, CellValue> tabularData = new HashMap<>();
+            int start = 0;
+            List<Integer> cellStarts = new ArrayList<>();
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
+                int cellStart = start;
+                cell.getHeaderCells().forEach(headerCell -> {
+                    StringBuilder headerBuilder = new StringBuilder();
+                    headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                    String headerName = headerBuilder.toString()
+                            .replaceAll("\n", "")
+                            .replaceAll(" ", "")
+                            .replaceAll("-", "");
+                    tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                });
+
+                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.intValue(), dictionary, local);
+            surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(local)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                            .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                            .collect(Collectors.toSet()) : rowEntities)
+                    .text(searchableRow.getAsStringWithLinebreaks())
+                    .searchText(searchableRow.toString())
+                    .headline(table.getHeadline())
+                    .sectionNumber(sectionNumber.intValue())
+                    .tabularData(tabularData)
+                    .searchableText(searchableRow)
+                    .dictionary(dictionary)
+                    .build(), searchableRow));
+
+            sectionNumber.incrementAndGet();
+        }
+        return sectionSearchableTextPairs;
+    }
+
+
+    private List<SectionSearchableTextPair> processTableAsOneText(Table table, ManualRedactions manualRedactions,
+                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
+                                                                  boolean local,
+                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        SearchableText entireTableText = new SearchableText();
+        for (List<Cell> row : table.getRows()) {
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
             }
         }
 
-        return entities;
+        Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);
+
+        sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                        .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                        .collect(Collectors.toSet()) : rowEntities)
+                .text(entireTableText.getAsStringWithLinebreaks())
+                .searchText(entireTableText.toString())
+                .headline(table.getHeadline())
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(entireTableText)
+                .dictionary(dictionary)
+                .build(), entireTableText));
+
+        return sectionSearchableTextPairs;
     }
 
 
-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber) {
+    private SectionSearchableTextPair processText(Paragraph paragraph, ManualRedactions manualRedactions,
+                                                  AtomicInteger sectionNumber, Dictionary dictionary, boolean local,
+                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+
+        SearchableText searchableText = paragraph.getSearchableText();
+        addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber
+                .intValue());
+        Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
+
+        return new SectionSearchableTextPair(Section.builder()
+                .isLocal(local)
+                .dictionaryTypes(dictionary.getTypes())
+                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
+                        .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
+                        .collect(Collectors.toSet()) : entities)
+                .text(searchableText.getAsStringWithLinebreaks())
+                .searchText(searchableText.toString())
+                .headline(paragraph.getHeadline())
+                .sectionNumber(sectionNumber.intValue())
+                .searchableText(searchableText)
+                .dictionary(dictionary)
+                .build(), searchableText);
+    }
+
+
+    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                     Dictionary dictionary, boolean local) {
 
         Set<Entity> found = new HashSet<>();
-        if (StringUtils.isEmpty(searchableText.toString())) {
+        String searchableString = searchableText.toString();
+        if (StringUtils.isEmpty(searchableString)) {
             return found;
         }
 
-        String inputString = searchableText.toString();
-        String lowercaseInputString = inputString.toLowerCase();
-        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));
+        String lowercaseInputString = searchableString.toLowerCase();
+        for (DictionaryModel model : dictionary.getDictionaryModels()) {
+            if (model.isCaseInsensitive()) {
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
             } else {
-                found.addAll(find(inputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
             }
         }
 
-        removeEntitiesContainedInLarger(found);
-
-        return found;
-
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
     }
 
 
-    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber) {
-
-        Set<Entity> found = new HashSet<>();
-        for (String value : values) {
-            int startIndex;
-            int stopIndex = 0;
-            do {
-                startIndex = inputString.indexOf(value, stopIndex);
-                stopIndex = startIndex + value.length();
-
-                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));
-                }
-            } while (startIndex > -1);
-        }
-        return found;
-    }
-
-
-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
-    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        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) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-    }
-
-
-    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

@@ -0,0 +1,140 @@
+package com.iqser.red.service.redaction.v1.server.redaction.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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@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, textBefore.endsWith(" ")));
+            }
+        }
+
+        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, textAfter.startsWith(" ")));
+            }
+        }
+    }
+
+
+    private String concatWordsBefore(String[] words, int number, boolean endWithSpace) {
+
+        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(" ");
+        }
+
+        String result = sb.toString().trim();
+        return endWithSpace ? result + " " : result;
+    }
+
+
+    private String concatWordsAfter(String[] words, int number, boolean startWithSpace) {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < number; i++) {
+            sb.append(words[i]).append(" ");
+        }
+
+        String result = sb.toString().trim();
+        return startWithSpace ? " " + result : result;
+    }
+
+}

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

@@ -0,0 +1,107 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+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.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@UtilityClass
+public class EntitySearchUtils {
+
+    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
+                            boolean local) {
+
+        Set<Entity> found = new HashSet<>();
+
+        for (String value : values) {
+
+            String cleanValue = value.trim();
+
+            if (cleanValue.length() <= 2) {
+                continue;
+            }
+
+            int startIndex;
+            int stopIndex = 0;
+            do {
+                startIndex = inputString.indexOf(cleanValue, stopIndex);
+                stopIndex = startIndex + cleanValue.length();
+
+                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));
+                }
+            } while (startIndex > -1);
+        }
+        return found;
+    }
+
+
+    private boolean isSeparator(char c) {
+
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+    }
+
+
+    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+
+        Map<String, List<Entity>> entitiesByWord = new HashMap<>();
+
+        for (Entity entity : entities) {
+            entitiesByWord.computeIfAbsent(entity.getWord(), (x) -> new ArrayList<>()).add(entity);
+        }
+
+        for (String word : entitiesByWord.keySet()) {
+
+            List<Entity> orderedEntities = entitiesByWord.get(word)
+                    .stream()
+                    .sorted(Comparator.comparing(Entity::getStart))
+                    .collect(Collectors.toList());
+            Entity firstEntity = orderedEntities.get(0);
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
+                    .getType()), firstEntity.getTargetSequences());
+
+            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
+                try {
+                    orderedEntities.get(i).setPositionSequences(List.of(positionSequences.get(i)));
+                } catch (Exception e) {
+                    log.warn("Mismatch between EntityPositionSequence and found Entity!");
+                }
+            }
+        }
+
+        removeEntitiesContainedInLarger(entities);
+
+        return entities;
+    }
+
+
+    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
+
+        List<Entity> wordsToRemove = new ArrayList<>();
+        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()) {
+                    wordsToRemove.add(inner);
+                }
+            }
+        }
+        entities.removeAll(wordsToRemove);
+    }
+}

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

@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 
 import lombok.experimental.UtilityClass;
@@ -19,14 +18,9 @@ public class IdBuilder {
 
         StringBuilder sb = new StringBuilder();
         crossSequenceParts.forEach(sequencePart -> sequencePart.getTextPositions().forEach(textPosition -> {
-            sb.append(textPosition.getTextMatrix());
+            sb.append(textPosition.getTextMatrix()).append(sequencePart.getPage());
         }));
 
         return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
     }
-
-
-    public String buildId(ManualRedactionEntry manualRedactionEntry) {
-        return hashFunction.hashString(manualRedactionEntry.toString(), StandardCharsets.UTF_8).toString();
-    }
 }

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

@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import lombok.experimental.UtilityClass;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+@UtilityClass
+public class Patterns {
+
+    public static Map<String, Pattern> patternCache = new HashMap<>();
+
+    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} )+");
+
+
+    public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {
+
+        String patternKey = pattern + caseInsensitive;
+        if (patternCache.containsKey(patternKey)) {
+            return patternCache.get(patternKey);
+        }
+        Pattern compiledPattern = Pattern.compile(pattern, caseInsensitive ? Pattern.CASE_INSENSITIVE : 0);
+        patternCache.put(patternKey, compiledPattern);
+        return compiledPattern;
+    }
+
+}

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(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
     }
 
 }

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

@@ -21,7 +21,6 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +36,7 @@ public class PdfSegmentationService {
     private final ClassificationService classificationService;
     private final SectionsBuilderService sectionsBuilderService;
 
+
     public Document parseDocument(PDDocument pdDocument) throws IOException {
 
         Document document = new Document();
@@ -56,19 +56,21 @@ public class PdfSegmentationService {
             int rotation = pdPage.getRotation();
             boolean isRotated = rotation != 0 && rotation != 360;
 
-            ParsedElements parsedElements = ParsedElements
-                    .builder()
+
+            ParsedElements parsedElements = ParsedElements.builder()
                     .rulings(stripper.getRulings())
                     .sequences(stripper.getTextPositionSequences())
-                    .minCharWidth(Utils.round(stripper.getMinCharWidth(), 2))
-                    .minCharHeight(Utils.round(stripper.getMinCharHeight(), 2))
+                    .maxCharWidth(stripper.getMaxCharWidths())
+                    .maxCharHeight(stripper.getMaxCharWidths())
                     .landscape(isLandscape)
                     .rotated(isRotated)
                     .build();
 
-            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), parsedElements.getMinCharWidth(), parsedElements.getMinCharHeight());
+            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), parsedElements
+                    .getMaxCharWidth(), parsedElements.getMaxCharHeight());
 
-            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings
+                    .getVertical());
             page.setRotation(rotation);
 
             tableExtractionService.extractTables(cleanRulings, page);
@@ -91,7 +93,10 @@ public class PdfSegmentationService {
 
     }
 
+
+
     private void increaseDocumentStatistics(Page page, Document document) {
+
         if (!page.isLandscape()) {
             document.getFontSizeCounter().addAll(page.getFontSizeCounter().getCountPerValue());
         }
@@ -100,6 +105,7 @@ public class PdfSegmentationService {
         document.getFontStyleCounter().addAll(page.getFontStyleCounter().getCountPerValue());
     }
 
+
     private void buildPageStatistics(Page page) {
 
         // Collect all statistics for the page, except from blocks inside tables, as tables will always be added to BodyTextFrame.

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

@@ -39,10 +39,12 @@ public class SectionsBuilderService {
 
                 current.setPage(page.getPageNumber());
 
-                if (prev != null && current.getClassification().startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
                     Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                     chunkBlock.setHeadline(lastHeadline);
-                    lastHeadline = current.getText();
+                    if(document.isHeadlines()) {
+                        lastHeadline = current.getText();
+                    }
                     chunkBlockList.add(chunkBlock);
                     chunkWords = new ArrayList<>();
                     if (CollectionUtils.isNotEmpty(chunkBlock.getTables())) {

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

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

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

@@ -28,4 +28,12 @@ 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,9 +2,12 @@ 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;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -20,10 +23,10 @@ public class Cell extends Rectangle {
 
     private boolean isHeaderCell;
 
+
     public Cell(Point2D topLeft, Point2D bottomRight) {
 
-        super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()),
-                (float) (bottomRight
+        super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight
                 .getY() - topLeft.getY()));
     }
 
@@ -33,4 +36,40 @@ public class Cell extends Rectangle {
         textBlocks.add(textBlock);
     }
 
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+
+
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        TextPositionSequence previous = null;
+        while (itty.hasNext()) {
+
+            TextBlock textBlock = itty.next();
+
+            for (TextPositionSequence word : textBlock.getSequences()) {
+                if (previous != null) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
+                }
+                sb.append(word.toString());
+                previous = word;
+            }
+
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
+                .replaceAll("\n", " ")
+                .replaceAll(" {2}", " ");
+    }
+
+
+
+
+
 }

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

@@ -18,9 +18,9 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
 @Service
 public class RulingCleaningService {
 
-    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth, float minCharHeight){
+    public CleanRulings getCleanRulings(List<Ruling> rulings, float maxCharWidth, float maxCharHeight){
         if (!rulings.isEmpty()) {
-            snapPoints(rulings, minCharWidth , minCharHeight);
+            snapPoints(rulings, maxCharWidth , maxCharHeight);
         }
 
         List<Ruling> vrs = new ArrayList<>();

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

@@ -30,12 +30,14 @@ public class TableExtractionService {
 
         List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());
 
+        List<TextBlock> toBeRemoved = new ArrayList<>();
+
         for (AbstractTextContainer abstractTextContainer : page.getTextBlocks()) {
             TextBlock textBlock = (TextBlock) abstractTextContainer;
             for (Cell cell : cells) {
-                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(),
-                        textBlock.getHeight())) {
+                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight())) {
                     cell.addTextBlock(textBlock);
+                    toBeRemoved.add(textBlock);
                     break;
                 }
             }
@@ -44,7 +46,6 @@ public class TableExtractionService {
         cells = new ArrayList<>(new HashSet<>(cells));
         Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER);
 
-
         List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells).stream()
                 .filter(r -> r.getWidth() > 0f && r.getHeight() > 0f)
                 .collect(Collectors.toList());
@@ -67,25 +68,23 @@ public class TableExtractionService {
             Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
             while (itty.hasNext()) {
                 AbstractTextContainer textBlock = itty.next();
-                if (table.contains(textBlock)) {
-                    if (position == -1) {
-                        position = page.getTextBlocks().indexOf(textBlock);
-                    }
-                    itty.remove();
+                if (table.contains(textBlock) && position == -1) {
+                    position = page.getTextBlocks().indexOf(textBlock);
                 }
             }
             if (position != -1) {
                 page.getTextBlocks().add(position, table);
             }
         }
+
+        page.getTextBlocks().removeAll(toBeRemoved);
     }
 
 
     public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
 
         List<Cell> cellsFound = new ArrayList<>();
-        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines,
-                verticalRulingLines);
+        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
         List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
         intersectionPointsList.sort(POINT_COMPARATOR);
 

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

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

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

@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.utils;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -13,23 +12,29 @@ public class Utils {
 
     private final static float EPSILON = 0.1f;
 
+
     public static boolean feq(double f1, double f2) {
+
         return (Math.abs(f1 - f2) < EPSILON);
     }
 
+
     public static float round(double d, int decimalPlace) {
+
         BigDecimal bd = BigDecimal.valueOf(d);
         bd = bd.setScale(decimalPlace, BigDecimal.ROUND_HALF_UP);
         return bd.floatValue();
     }
 
-	public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
+    public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
         try {
-            Collections.sort(list, comparator);
-        } catch (IllegalArgumentException e){
-            //TODO Figure out why this happens.
+            QuickSort.sort(list, comparator);
+        } catch (IllegalArgumentException e) {
+            // This should not happen since we use QuickSort from PDFBox
             log.warn(e.getMessage());
         }
-	}
+    }
 
 }

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

@@ -1,9 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.visualization.service;
 
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
+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;
+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.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -13,29 +31,20 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
 import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 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.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-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.parsing.model.TextPositionSequence;
-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.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class AnnotationHighlightService {
@@ -43,7 +52,10 @@ public class AnnotationHighlightService {
     private final DictionaryService dictionaryService;
 
 
-    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction, ManualRedactions manualRedactions) throws IOException {
+    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction,
+                          ManualRedactions manualRedactions, String ruleSetId) throws IOException {
+
+        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
 
         for (int page = 1; page <= document.getNumberOfPages(); page++) {
 
@@ -51,51 +63,145 @@ public class AnnotationHighlightService {
 
             drawSectionFrames(document, classifiedDoc, flatRedaction, pdPage, page);
 
-            if (classifiedDoc.getEntities().get(page) == null) {
-                continue;
+            if (classifiedDoc.getEntities().get(page) != null) {
+                addAnnotations(pdPage, classifiedDoc, flatRedaction, manualRedactions, page, ruleSetId);
             }
 
-            addAnnotations(pdPage, classifiedDoc, flatRedaction, manualRedactions, page);
-            addManualAnnotations(pdPage, classifiedDoc, manualRedactions, page);
+            if (manualRedactionPages.contains(page)) {
+                addManualAnnotations(pdPage, classifiedDoc, manualRedactions, page, ruleSetId);
+            }
         }
     }
 
 
-    private void addAnnotations(PDPage pdPage, Document classifiedDoc, boolean flatRedaction, ManualRedactions manualRedactions, int page) throws IOException {
+    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
+
+        Set<Integer> manualRedactionPages = new HashSet<>();
+
+        if (manualRedactions == null) {
+            return manualRedactionPages;
+        }
+
+        manualRedactions.getEntriesToAdd().forEach(entry -> {
+            entry.getPositions().forEach(pos -> {
+                manualRedactionPages.add(pos.getPage());
+            });
+        });
+        return manualRedactionPages;
+    }
+
+
+    private void addAnnotations(PDPage pdPage, Document classifiedDoc, boolean flatRedaction,
+                                ManualRedactions manualRedactions, int page, String ruleSetId) throws IOException {
 
         List<PDAnnotation> annotations = pdPage.getAnnotations();
 
+        // Duplicates can exist due table extraction colums over multiple rows.
+        Set<String> processedIds = new HashSet<>();
+
+        entityLoop:
         for (Entity entity : classifiedDoc.getEntities().get(page)) {
 
-            if (flatRedaction && !isRedactionType(entity)) {
+            if (flatRedaction && !isRedactionType(entity, ruleSetId)) {
                 continue;
             }
 
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
+            boolean requestedToRemove = false;
+            List<Comment> comments = null;
 
             for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
 
-                if (manualRedactions != null && manualRedactions.getIdsToRemove()
-                        .contains(entityPositionSequence.getId())) {
-                    entity.setRedaction(false);
-                    entity.setRedactionReason(entity.getRedactionReason() + ", removed by manual override");
-                    redactionLogEntry.setManual(true);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, ruleSetId);
+                if (processedIds.contains(entityPositionSequence.getId())) {
+
+                    // TODO refactor this outer loop jump as soon as we have the time.
+                    continue entityLoop;
+                } else {
+                    processedIds.add(entityPositionSequence.getId());
                 }
 
-                for (TextPositionSequence textPositions : entityPositionSequence.getSequences()) {
+                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
+                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
+                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
+                            comments = manualRedactions.getComments().get(manualRemoval.getId());
+                            String manualOverrideReason = null;
+                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                                entity.setRedaction(false);
+                                redactionLogEntry.setRedacted(false);
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
+                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                                requestedToRemove = true;
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                        }
+                    }
 
-                    Rectangle rectangle = textPositions.getRectangle();
-                    redactionLogEntry.getPositions().add(rectangle);
-                    annotations.add(createAnnotation(rectangle, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity), !flatRedaction && !isHint(entity)));
                 }
+
+                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
+                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
+                            .stream()
+                            .flatMap(seq -> seq.getTextPositions().stream())
+                            .collect(Collectors.toList()), page);
+
+                    if (manualRedactions != null) {
+                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
+                    }
+
+                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);
+
+                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, ruleSetId, requestedToRemove), comments, !isHint(entity, ruleSetId)));
+                }
+
                 redactionLogEntry.setId(entityPositionSequence.getId());
+
+                // FIXME ids should never be null. Figure out why this happens.
+                if (redactionLogEntry.getId() != null) {
+                    classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+                }
             }
-            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+
         }
+
     }
 
 
-    private void addManualAnnotations(PDPage pdPage, Document classifiedDoc, ManualRedactions manualRedactions, int page) throws IOException {
+    private List<Rectangle> getRectanglesPerLine(List<TextPosition> textPositions, int page) {
+
+        List<Rectangle> rectangles = new ArrayList<>();
+        if (textPositions.size() == 1) {
+            rectangles.add(new TextPositionSequence(textPositions, page).getRectangle());
+        } else {
+            float y = textPositions.get(0).getYDirAdj();
+            int startIndex = 0;
+            for (int i = 1; i < textPositions.size(); i++) {
+                float yDirAdj = textPositions.get(i).getYDirAdj();
+                if (yDirAdj != y) {
+                    rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, i), page).getRectangle());
+                    y = yDirAdj;
+                    startIndex = i;
+                }
+            }
+            if (startIndex != textPositions.size() - 1) {
+                rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+            }
+        }
+
+        return rectangles;
+    }
+
+
+    private void addManualAnnotations(PDPage pdPage, Document classifiedDoc, ManualRedactions manualRedactions,
+                                      int page, String ruleSetId) throws IOException {
 
         if (manualRedactions == null) {
             return;
@@ -105,32 +211,40 @@ public class AnnotationHighlightService {
 
         for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
 
-            String id = IdBuilder.buildId(manualRedactionEntry);
+            String id = manualRedactionEntry.getId();
 
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry);
+            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, ruleSetId);
 
+            List<Rectangle> rectanglesOnPage = new ArrayList<>();
             for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-
-                if (page != rectangle.getPage()) {
-                    continue;
+                if (page == rectangle.getPage()) {
+                    rectanglesOnPage.add(rectangle);
+                    redactionLogEntry.getPositions().add(rectangle);
                 }
-
-                PDAnnotationTextMarkup highlight = createAnnotation(rectangle, id, createAnnotationContent(manualRedactionEntry), getColor(manualRedactionEntry
-                        .getType()), true);
-                annotations.add(highlight);
-
-                redactionLogEntry.getPositions().add(rectangle);
             }
-            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+
+            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                annotations.addAll(createAnnotation(rectanglesOnPage, id, createAnnotationContent(manualRedactionEntry), getColorForManualAdd(manualRedactionEntry
+                        .getType(), ruleSetId, manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true));
+                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+            }
         }
     }
 
 
-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry) {
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id, String ruleSetId) {
 
         return RedactionLogEntry.builder()
-                .color(getColor(manualRedactionEntry.getType()))
+                .id(id)
+                .color(getColor(manualRedactionEntry.getType(), ruleSetId))
                 .reason(manualRedactionEntry.getReason())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
                 .value(manualRedactionEntry.getValue())
                 .type(manualRedactionEntry.getType())
                 .redacted(true)
@@ -138,77 +252,131 @@ public class AnnotationHighlightService {
                 .section(manualRedactionEntry.getSection())
                 .sectionNumber(manualRedactionEntry.getSectionNumber())
                 .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
+                .isDictionaryEntry(false)
                 .build();
     }
 
 
-    private RedactionLogEntry createRedactionLogEntry(Entity entity) {
+    private RedactionLogEntry createRedactionLogEntry(Entity entity, String ruleSetId) {
 
         return RedactionLogEntry.builder()
-                .color(getColor(entity))
+                .color(getColor(entity, ruleSetId, false))
                 .reason(entity.getRedactionReason())
+                .legalBasis(entity.getLegalBasis())
                 .value(entity.getWord())
                 .type(entity.getType())
                 .redacted(entity.isRedaction())
-                .isHint(isHint(entity))
+                .isHint(isHint(entity, ruleSetId))
+                .isRecommendation(isRecommendation(entity, ruleSetId))
                 .section(entity.getHeadline())
                 .sectionNumber(entity.getSectionNumber())
+                .matchedRule(entity.getMatchedRule())
+                .isDictionaryEntry(entity.isDictionaryEntry())
+                .textAfter(entity.getTextAfter())
+                .textBefore(entity.getTextBefore())
                 .build();
     }
 
 
-    private PDAnnotationTextMarkup createAnnotation(Rectangle rectangle, String id, String content, float[] color, boolean popup) {
+    private List<PDAnnotation> createAnnotation(List<Rectangle> rectangles, String id, String content, float[] color,
+                                                List<Comment> comments, boolean popup) {
+
+        List<PDAnnotation> annotations = new ArrayList<>();
 
         PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
         annotation.constructAppearances();
-        annotation.setRectangle(toPDRectangle(rectangle));
-        annotation.setQuadPoints(toQuadPoints(rectangle));
+        PDRectangle pdRectangle = toPDRectangle(rectangles);
+        annotation.setRectangle(pdRectangle);
+        annotation.setQuadPoints(toQuadPoints(rectangles));
         if (popup) {
-            annotation.setAnnotationName(id);
-            annotation.setTitlePopup(id);
             annotation.setContents(content);
         }
+        annotation.setTitlePopup(id);
+        annotation.setAnnotationName(id);
         annotation.setColor(new PDColor(color, PDDeviceRGB.INSTANCE));
-        return annotation;
+        annotations.add(annotation);
+
+        if (comments != null) {
+            for (Comment comment : comments) {
+                PDAnnotationText txtAnnot = new PDAnnotationText();
+                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
+                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
+                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
+                txtAnnot.setTitlePopup(comment.getUser());
+                txtAnnot.setContents(comment.getText());
+                txtAnnot.setRectangle(pdRectangle);
+                annotations.add(txtAnnot);
+            }
+        }
+
+        return annotations;
     }
 
 
     private String createAnnotationContent(Entity entity) {
 
-        return new StringBuilder().append("\nRule ")
-                .append(entity.getMatchedRule())
-                .append(" matched")
-                .append("\n\n")
-                .append(entity.getRedactionReason())
-                .append("\n\nIn Section : \"")
-                .append(entity.getHeadline())
-                .append("\"")
-                .toString();
+        return "\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\nLegal basis:" + entity
+                .getLegalBasis() + "\n\nIn section: \"" + entity.getHeadline() + "\"";
     }
 
 
     private String createAnnotationContent(ManualRedactionEntry entry) {
 
-        return new StringBuilder().append("\nManual Redaction")
-                .append("\n\nIn Section : \"")
-                .append(entry.getSection())
-                .append("\"")
-                .toString();
+        return "\nManual Redaction\n\nIn Section : \"" + entry.getSection() + "\"";
     }
 
 
-    private PDRectangle toPDRectangle(Rectangle rectangle) {
+    private PDRectangle toPDRectangle(List<Rectangle> rectangles) {
+
+        float lowerLeftX = Float.MAX_VALUE;
+        float upperRightX = 0;
+        float lowerLeftY = 0;
+        float upperRightY = Float.MAX_VALUE;
+
+        for (Rectangle rectangle : rectangles) {
+            if (rectangle.getTopLeft().getX() < lowerLeftX) {
+                lowerLeftX = rectangle.getTopLeft().getX();
+            }
+            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
+                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
+            }
+            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
+                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
+            }
+            if (rectangle.getTopLeft().getY() < upperRightY) {
+                upperRightY = rectangle.getTopLeft().getY();
+            }
+        }
 
         PDRectangle annotationPosition = new PDRectangle();
-        annotationPosition.setLowerLeftX(rectangle.getTopLeft().getX());
-        annotationPosition.setLowerLeftY(rectangle.getTopLeft().getY() + rectangle.getHeight());
-        annotationPosition.setUpperRightX(rectangle.getTopLeft().getX() + rectangle.getWidth());
-        annotationPosition.setUpperRightY(rectangle.getTopLeft().getY());
+        annotationPosition.setLowerLeftX(lowerLeftX);
+        annotationPosition.setLowerLeftY(lowerLeftY);
+        annotationPosition.setUpperRightX(upperRightX);
+        annotationPosition.setUpperRightY(upperRightY);
         return annotationPosition;
     }
 
 
-    private float[] toQuadPoints(Rectangle rectangle) {
+    private float[] toQuadPoints(List<Rectangle> rectangles) {
+
+        float[] quadPoints = new float[rectangles.size() * 8];
+        int i = 0;
+
+        for (Rectangle rectangle : rectangles) {
+            float[] quadPoint = toQuadPoint(rectangle);
+            for (int j = 0; j <= 7; j++) {
+                quadPoints[i + j] = quadPoint[j];
+            }
+            i += 8;
+        }
+        return quadPoints;
+    }
+
+
+    private float[] toQuadPoint(Rectangle rectangle) {
 
         // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
         // of the area to be highlighted
@@ -219,50 +387,54 @@ public class AnnotationHighlightService {
     }
 
 
-    private boolean isRedactionType(Entity entity) {
+    private boolean isRedactionType(Entity entity, String ruleSetId) {
 
         if (!entity.isRedaction()) {
             return false;
         }
-        if (isHint(entity)) {
-            return false;
-        }
-        return true;
+        return !isHint(entity, ruleSetId);
     }
 
 
-    private float[] getColor(Entity entity) {
+    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {
 
-        if (!entity.isRedaction() && !isHint(entity)) {
-            return new float[]{0.627f, 0.627f, 0.627f};
+        if (requestedToRemove) {
+            return dictionaryService.getRequestRemoveColor(ruleSetId);
         }
-        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
-            return dictionaryService.getDefaultColor();
+        if (!entity.isRedaction() && !isHint(entity, ruleSetId)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
         }
-        return dictionaryService.getEntryColors().get(entity.getType());
+        return dictionaryService.getColor(entity.getType(), ruleSetId);
     }
 
 
-    private float[] getColor(String type) {
+    private float[] getColorForManualAdd(String type, String ruleSetId, Status status) {
 
-        if (!dictionaryService.getEntryColors().containsKey(type)) {
-            return dictionaryService.getDefaultColor();
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(ruleSetId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
         }
-        return dictionaryService.getEntryColors().get(type);
+        return getColor(type, ruleSetId);
     }
 
 
-    private boolean isHint(Entity entity) {
-
-        List<String> hintTypes = dictionaryService.getHintTypes();
-        if (CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType())) {
-            return true;
-        }
-        return false;
+    private float[] getColor(String type, String ruleSetId) {
+        return dictionaryService.getColor(type, ruleSetId);
     }
 
 
-    private void drawSectionFrames(PDDocument document, Document classifiedDoc, boolean flatRedaction, PDPage pdPage, int page) throws IOException {
+    private boolean isHint(Entity entity, String ruleSetId) {
+        return dictionaryService.isHint(entity.getType(), ruleSetId);
+    }
+
+    private boolean isRecommendation(Entity entity, String ruleSetId) {
+        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
+    }
+
+
+    private void drawSectionFrames(PDDocument document, Document classifiedDoc, boolean flatRedaction, PDPage pdPage,
+                                   int page) throws IOException {
 
         if (flatRedaction) {
             return;
@@ -279,11 +451,27 @@ 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());
-                    visualizeTable((Table) textBlock, contentStream);
+                    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));
+
                 }
             }
         }
@@ -309,8 +497,9 @@ public class AnnotationHighlightService {
     }
 
 
-    private void visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
+    private List<CellRectangle> visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
 
+        List<CellRectangle> cellRectangles = new ArrayList<>();
         for (List<Cell> row : table.getRows()) {
             for (Cell cell : row) {
 
@@ -320,6 +509,8 @@ 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()));
                 }
             }
         }
@@ -332,6 +523,8 @@ 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

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

redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml

@@ -0,0 +1,4 @@
+server:
+  port: 8083
+
+configuration-service.url: "http://localhost:8081"

redaction-service-v1/redaction-service-server-v1/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 info:
   description: Redaction Service Server V1
 
+configuration-service.url: "http://configuration-service-v1:8080"
+
 server:
   port: 8080
 
@@ -12,5 +14,6 @@ management:
   endpoint:
     metrics.enabled: ${monitoring.enabled:false}
     prometheus.enabled: ${monitoring.enabled:false}
+    health.enabled: true
   endpoints.web.exposure.include: prometheus, health
   metrics.export.prometheus.enabled: ${monitoring.enabled:false}

redaction-service-v1/redaction-service-server-v1/src/main/resources/bootstrap.yml

@@ -2,10 +2,6 @@ spring:
   application:
     name: redaction-service-v1
 
-
-management:
-  endpoints:
-    web:
-      base-path: /
-      path-mapping:
-        health: "health"
+management.endpoints:
+  web.base-path: /
+  enabled-by-default: false

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

@@ -1,25 +1,25 @@
 package com.iqser.red.service.redaction.v1.server;
 
-import static org.mockito.Mockito.when;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.iqser.red.service.configuration.v1.api.model.Colors;
+import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+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.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.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.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,35 +37,51 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-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.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = DEFINED_PORT)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
 public class RedactionIntegrationTest {
 
     private static final String RULES = loadFromClassPath("drools/rules.drl");
-    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 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 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;
@@ -77,9 +93,13 @@ public class RedactionIntegrationTest {
     private DictionaryClient dictionaryClient;
 
     private final Map<String, List<String>> dictionary = new HashMap<>();
-    private final Map<String, float[]> typeColorMap = new HashMap<>();
+    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();
+
+    private final static String TEST_RULESET_ID = "123";
 
     @TestConfiguration
     public static class RedactionIntegrationTestConfiguration {
@@ -106,38 +126,50 @@ public class RedactionIntegrationTest {
     @Before
     public void stubClients() {
 
-        when(rulesClient.getVersion()).thenReturn(0L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(RULES));
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(RULES));
 
         loadDictionaryForTest();
         loadTypeForTest();
-        when(dictionaryClient.getVersion()).thenReturn(0L);
-        when(dictionaryClient.getAllTypes()).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
-        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(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.getDefaultColor()).thenReturn(new DefaultColor(new float[]{1f, 0.502f, 0f}));
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE));
+        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(ADDRESS));
+        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(AUTHOR));
+        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(SPONSOR));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(HINT_ONLY));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(MUST_REDACT));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(TEST_METHOD));
+        when(dictionaryClient.getDictionaryForType(PII, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PII));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
+        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
     }
 
 
     private void loadDictionaryForTest() {
 
-        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/names.txt")
+        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_author.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
+        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
+        dictionary.computeIfAbsent(VERTEBRATE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrate.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
@@ -161,6 +193,36 @@ 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()));
     }
 
 
@@ -172,29 +234,70 @@ public class RedactionIntegrationTest {
 
     private void loadTypeForTest() {
 
-        typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
-        typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
-        typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
-        typeColorMap.put(NO_REDACTION_INDICATOR, new float[]{0.8f, 0, 0.8f});
-        typeColorMap.put(REDACTION_INDICATOR, new float[]{1, 0.502f, 0.1f});
-        typeColorMap.put(HINT_ONLY, new float[]{0.8f, 1, 0.8f});
-        typeColorMap.put(MUST_REDACT, new float[]{1, 0, 0});
+        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");
 
-        hintTypeMap.put(VERTEBRATES_CODE, true);
-        hintTypeMap.put(ADDRESS_CODE, false);
-        hintTypeMap.put(NAME_CODE, false);
+        hintTypeMap.put(VERTEBRATE, true);
+        hintTypeMap.put(ADDRESS, false);
+        hintTypeMap.put(AUTHOR, 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(VERTEBRATES_CODE, true);
-        caseInSensitiveMap.put(ADDRESS_CODE, false);
-        caseInSensitiveMap.put(NAME_CODE, false);
+        caseInSensitiveMap.put(VERTEBRATE, true);
+        caseInSensitiveMap.put(ADDRESS, false);
+        caseInSensitiveMap.put(AUTHOR, 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");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
     }
 
 
@@ -204,9 +307,11 @@ public class RedactionIntegrationTest {
                 .stream()
                 .map(typeColor -> TypeResult.builder()
                         .type(typeColor.getKey())
-                        .color(typeColor.getValue())
+                        .ruleSetId(TEST_RULESET_ID)
+                        .hexColor(typeColor.getValue())
                         .isHint(hintTypeMap.get(typeColor.getKey()))
                         .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
+                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
                         .build())
 
                 .collect(Collectors.toList());
@@ -216,10 +321,11 @@ public class RedactionIntegrationTest {
     private DictionaryResponse getDictionaryResponse(String type) {
 
         return DictionaryResponse.builder()
-                .color(typeColorMap.get(type))
+                .hexColor(typeColorMap.get(type))
                 .entries(dictionary.get(type))
                 .isHint(hintTypeMap.get(type))
                 .isCaseInsensitive(caseInSensitiveMap.get(type))
+                .isRecommendation(recommendationTypeMap.get(type))
                 .build();
     }
 
@@ -227,6 +333,7 @@ public class RedactionIntegrationTest {
     @Test
     public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
 
+        long start = System.currentTimeMillis();
         System.out.println("noExceptionShouldBeThrownForAnyFiles");
         ClassLoader loader = getClass().getClassLoader();
         URL url = loader.getResource("files");
@@ -237,12 +344,26 @@ public class RedactionIntegrationTest {
         }
         for (File path : input) {
             RedactionRequest request = RedactionRequest.builder()
+                    .ruleSetId(TEST_RULESET_ID)
                     .document(IOUtils.toByteArray(new FileInputStream(path)))
                     .build();
             System.out.println("Redacting file : " + path.getName());
-            redactionController.redact(request);
+            RedactionResult result = redactionController.redact(request);
+
+            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();
+            result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+                duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
+            });
+
+            duplicates.entrySet().forEach(entry -> {
+                assertThat(entry.getValue().size()).isEqualTo(1);
+            });
         }
 
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+
     }
 
 
@@ -269,15 +390,22 @@ public class RedactionIntegrationTest {
 
         System.out.println("redactionTest");
         long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/96 Trinexapac-ethyl_RAR_09_Volume_3CA_B-7_2018-02-23.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                 .build();
         request.setFlatRedaction(false);
 
         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());
         }
@@ -296,6 +424,7 @@ public class RedactionIntegrationTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                 .build();
 
@@ -319,9 +448,26 @@ public class RedactionIntegrationTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");
 
         ManualRedactions manualRedactions = new ManualRedactions();
-        manualRedactions.setIdsToRemove(Set.of("0836727c3508a0b2ea271da69c04cc2f"));
+
+        String manualAddId = UUID.randomUUID().toString();
+
+        Comment comment = Comment.builder()
+                .date(OffsetDateTime.now())
+                .user("TEST_USER")
+                .text("This is a comment test")
+                .build();
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .id("0836727c3508a0b2ea271da69c04cc2f")
+                .status(Status.REQUESTED)
+                .build()));
+
+        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
+        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
+        manualRedactions.getComments().put(manualAddId, List.of(comment));
 
         ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
+        manualRedactionEntry.setId(manualAddId);
+        manualRedactionEntry.setStatus(Status.REQUESTED);
         manualRedactionEntry.setType("name");
         manualRedactionEntry.setValue("O'Loughlin C.K.");
         manualRedactionEntry.setReason("Manual Redaction");
@@ -330,6 +476,7 @@ public class RedactionIntegrationTest {
         manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
 
         RedactionRequest request = RedactionRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                 .manualRedactions(manualRedactions)
                 .build();
@@ -350,8 +497,7 @@ public class RedactionIntegrationTest {
     public void classificationTest() throws IOException {
 
         System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -369,8 +515,7 @@ public class RedactionIntegrationTest {
     public void sectionsTest() throws IOException {
 
         System.out.println("sectionsTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.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()))
@@ -388,8 +533,7 @@ public class RedactionIntegrationTest {
     public void htmlTablesTest() throws IOException {
 
         System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/52 Fludioxonil_RAR_07_Volume_3CA_B-5_2018-02-21.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -407,8 +551,7 @@ public class RedactionIntegrationTest {
     public void htmlTableRotationTest() throws IOException {
 
         System.out.println("htmlTableRotationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S" +
-                "-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
 
         RedactionRequest request = RedactionRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -422,14 +565,58 @@ public class RedactionIntegrationTest {
     }
 
 
+    @Test
+    public void phantomCellsDocumentTest() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Phantom Cells.pdf");
+
+        RedactionRequest request = RedactionRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+        request.setFlatRedaction(false);
+
+        RedactionResult result = redactionController.redact(request);
+
+        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+            if (!entry.isHint()) {
+                assertThat(entry.getReason()).isEqualTo("Not redacted because row is not a vertebrate study");
+            }
+        });
+    }
+
+
+    @Test
+    public void sponsorCompanyTest() throws IOException {
+
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");
+
+        RedactionRequest request = RedactionRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .flatRedaction(false)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        RedactionResult result = redactionController.redact(request);
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
+            fileOutputStream.write(result.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
     private static String loadFromClassPath(String path) {
 
         URL resource = ResourceLoader.class.getClassLoader().getResource(path);
         if (resource == null) {
             throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
         }
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(),
-                StandardCharsets.UTF_8))) {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
             StringBuilder sb = new StringBuilder();
             String str;
             while ((str = br.readLine()) != null) {

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

@@ -1,22 +1,18 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
+import com.iqser.red.service.configuration.v1.api.model.Colors;
+import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+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.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.junit.Before;
@@ -35,28 +31,38 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-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.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+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 static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class EntityRedactionServiceTest {
 
     private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
-    private static final String NAME_CODE = "name";
+    private static final String AUTHOR_CODE = "author";
     private static final String ADDRESS_CODE = "address";
+    private static final String SPONSOR_CODE = "sponsor";
 
     private static final AtomicLong DICTIONARY_VERSION = new AtomicLong();
+    private static final AtomicLong RULES_VERSION = new AtomicLong();
+
     @MockBean
     private DictionaryClient dictionaryClient;
 
@@ -69,6 +75,11 @@ public class EntityRedactionServiceTest {
     @Autowired
     private PdfSegmentationService pdfSegmentationService;
 
+    @Autowired
+    private DroolsExecutionService droolsExecutionService;
+
+    private final static String TEST_RULESET_ID = "123";
+
     @TestConfiguration
     public static class RedactionIntegrationTestConfiguration {
 
@@ -95,11 +106,11 @@ public class EntityRedactionServiceTest {
     public void testNestedEntitiesRemoval() {
 
         Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
         entities.add(nested);
         entities.add(nesting);
-        entityRedactionService.removeEntitiesContainedInLarger(entities);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
 
         assertThat(entities.size()).isEqualTo(1);
         assertThat(entities).contains(nesting);
@@ -119,18 +130,55 @@ public class EntityRedactionServiceTest {
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
                 .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(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                 .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
 
         try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
             assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
-            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 names, 1 address, 1 Y and 2 N entities
+            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+        }
+    }
+
+
+    @Test
+    public void testNestedRedaction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/nested_redaction.pdf");
+
+        RedactionRequest redactionRequest = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
+                .build();
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
         }
     }
 
@@ -140,18 +188,22 @@ public class EntityRedactionServiceTest {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Cyprodinil/40 Cyprodinil - EU AIR3 - LCA Section 1" +
                 " Supplement - Identity of the active substance - Reference list.pdf");
-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/names.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
             assertThat(classifiedDoc.getEntities()
                     .entrySet()
                     .stream()
@@ -161,7 +213,7 @@ public class EntityRedactionServiceTest {
                 "the plant protection product.pdf");
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
             assertThat(classifiedDoc.getEntities()
                     .entrySet()
                     .stream()
@@ -173,19 +225,23 @@ public class EntityRedactionServiceTest {
     public void testFalsePositiveInWrongCell() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/names.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/addresses.txt")))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                 .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
-            assertThat(classifiedDoc.getEntities()).hasSize(1); // two pages
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
             assertThat(classifiedDoc.getEntities().get(1).stream()
                     .filter(entity -> entity.getMatchedRule() == 9)
                     .count()).isEqualTo(10);
@@ -194,6 +250,116 @@ public class EntityRedactionServiceTest {
     }
 
 
+    @Test
+    public void testApplicantInTableRedaction() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" +
+                "rule \"6: Redact contact information if applicant is found\"\n" +
+                "   when\n" +
+                "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
+                "   then\n" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6,true, \"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\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6,true, \"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\"," +
+                " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6,true, \"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" +
+                "   end";
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_RULESET_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 6)
+                    .count()).isEqualTo(13);
+        }
+
+    }
+
+
+    @Test
+    public void testSponsorInCell() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" + "rule \"11: Redact sponsor company\"\n" + "    when\n" + "        " +
+                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
+                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
+                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_RULESET_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse authorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(authorResponse);
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 11)
+                    .count()).isEqualTo(1);
+        }
+
+    }
+
+
     @Test
     public void headerPropagation() throws IOException {
 
@@ -203,19 +369,44 @@ public class EntityRedactionServiceTest {
                 .entries(Arrays.asList("Bissig R.", "Thanei P."))
                 .build();
 
-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
+            assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
+        }
+
+        pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation2.pdf");
+
+        dictionaryResponse = DictionaryResponse.builder()
+                .entries(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C."))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        addressResponse = DictionaryResponse.builder()
+                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
-            assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
-            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
-            assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(4);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, 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);
         }
     }
 
@@ -229,16 +420,20 @@ public class EntityRedactionServiceTest {
                 .entries(Collections.singletonList("Aldershof S."))
                 .build();
 
-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
                 .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc, null);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
             assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
             assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
         }
@@ -254,30 +449,51 @@ public class EntityRedactionServiceTest {
                 "global Section section\n" +
                 "rule \"8: Not redacted because Vertebrate Study = N\"\n" +
                 "    when\n" +
-                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\"))\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
                 "    then\n" +
-                "        section.redactNot(\"name\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", false, \"Not redacted because row is not a vertebrate study\");\n" +
                 "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
                 "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
                 "    end\n" +
                 "rule \"9: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study\"\n" +
                 "    when\n" +
-                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\"))\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
+                "\"Yes\"))\n" +
                 "    then\n" +
-                "        section.redact(\"name\", 9, \"Redacted because row is a vertebrate study\");\n" +
-                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\");\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
+                " 1107/2009 Art. 63 (2g)\");\n" +
                 "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
                 "    end";
-        when(rulesClient.getVersion()).thenReturn(1L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
         TypeResponse typeResponse = TypeResponse.builder()
                 .types(Arrays.asList(
-                        TypeResult.builder().type(NAME_CODE).color(new float[]{1, 1, 0}).build(),
-                        TypeResult.builder().type(ADDRESS_CODE).color(new float[]{0, 1, 1}).build()))
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(SPONSOR_CODE).hexColor("#00ffff").build()))
                 .build();
-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getAllTypes()).thenReturn(typeResponse);
-        when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor());
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(typeResponse);
+
+        // Default empty return to prevent NPEs
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+
+        Colors colors = new Colors();
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
+
+        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
     }
 
 

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

@@ -0,0 +1,95 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RegExPatternTest {
+
+
+    @Test
+    public void testEmailRegEx(){
+        String text = "Address: Schwarzwaldalle " +
+                "P.O.Box\n" +
+                "CH-4002 Basel\n" +
+                "Switzerland\n" +
+                "Contact: Christian Warmers\n" +
+                "Tel: +41 (61) 323 8044\n" +
+                "christian.warmers@syngenta.com";
+
+
+        Pattern p = Pattern.compile("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", Pattern.CASE_INSENSITIVE);
+
+        Matcher matcher = p.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(0);
+            System.out.println(match);
+        }
+    }
+
+
+    @Test
+    public void testEtAlRegEx() {
+        String text = "To assess the potential of S-metolachlor to cause endocrine disruption (ED) a review (Charlton 2014,\n" +
+                "ASB2016-762) was submitted that summarises results from regulatory and open scientific literature\n" +
+                "studies covering in vitro and in vivo studies (level 2-5 of the OECD Conceptual Framework). According to this information metolachlor increased (1.5-fold) aromatase activity in JEG-3 cells (Laville et al.\n" +
+                "2006, ASB2010-14391) and induced weak anti-androgenic activity in the MDA-kb2 reporter cell line\n" +
+                "with a IC50 of 9.92 µM (IC50 of positive control flutamide: 0.51 µM) (Aït-Aïssa et al. 2010, ASB2015-\n" +
+                "9562). Data from the Tox21 high throughput screening revealed just few postive findings in assays to\n" +
+                "identify antagonists of the androgen receptor. An isolated result of this screening showed agonistic\n" +
+                "activity on the thyroid stimulating hormone receptor, while Dalton et al. (2003, ASB2018-2832)\n" +
+                "demonstrated that metolachlor induced CYP2B1/2 and CYP3A1/2 but did not affect T4, T3 or TSH.\n" +
+                "After prepubertal exposure of male Wistar rats to metolachlor (Mathias et al. 2012, ASB2016-9890) a\n" +
+                "statistically significant increase of serum hormone concentration was observed for testosterone (at the\n" +
+                "dose 50 mg/kg) as well as a statistically significant decrease in the age of preputial separation at a dose\n" +
+                "of 5 and 50 mg/kg. Furthermore a statistically significant increase for estradiol at a dose of 50 mg/kg\n" +
+                "and for FSH at a dose of 5 and 50 mg/kg and morphological alterations of the seminiferous epithelium\n" +
+                "were observed. Relative testicular weight was not altered. A statistically significant increase of relative\n" +
+                "weights was observed in long-term studies with rats (Tisdel et al. 1983, TOX9800328 ). This finding\n" +
+                "was attributed to lower terminal body weight. In mice a statistically significant decrease of the weight\n" +
+                "seminal vesicle (Tisdel et al. 1982, TOX9800327) was shown after 24 month treatment with\n" +
+                "metolachlor. In a mouse preimplantation embryo assay from open literature metolachlor increased the\n" +
+                "percentage of apoptosis significantly and reduced the mean number of cells per embryo significantly\n" +
+                "while the percentage of developing blastocytes was unaltered (Grennlee et al. 2004, ASB2016-9889).\n" +
+                "In reproduvtive toxicity studies a retarded body weight development of the pups was observed, while\n" +
+                "survival and normal morphological and functional development were not altered. No adverse effects\n" +
+                "on male fertility were seen, however important parameters to assess effects on female fertility like\n" +
+                "cyclicity, ovarian follicles as well as developmental landmarks in the offspring have not been investigated.";
+
+        Pattern p = Pattern.compile("([^\\s(]*?( \\w\\.?)?) et al\\.?");
+
+        Matcher matcher = p.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(1);
+            System.out.println(match);
+        }
+    }
+
+
+    @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);
+            }
+        }
+    }
+}

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

@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class TextNormalizationUtilities {
-
-    /**
-     * Revert hyphenation due to line breaks.
-     * @param text Text to be processed.
-     * @return Text without line-break hyphenation.
-     */
-    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
-    }
-
-}

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

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -1,9 +1,9 @@
+configuration-service.url: "http://configuration-service-v1:8080"
 
 ribbon:
   ConnectTimeout: 600000
   ReadTimeout: 600000
 
-
 spring:
   main:
     allow-bean-definition-overriding: true

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

@@ -0,0 +1,8 @@
+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
+Syngenta Monthey Switzerland
+Syngenta Nantong, China
+Syngenta, Switzerland

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

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

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

@@ -1,2 +0,0 @@
-guideline
-unpublished

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

@@ -1,3 +0,0 @@
-Batches Produced at
-CTL
-determination of residues

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

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

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

@@ -0,0 +1,87 @@
+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,9 +1,12 @@
-in vivo
-in-vivo
-dermal penetration
-oral toxicity
-oral-toxicity
 acute toxicity
 acute-toxicity
+dermal penetration
 eco toxicity
-eco-toxicity
+eco-toxicity
+Env. Mol. Mutagen,
+in vivo
+in-vivo
+ld
+oral toxicity
+oral-toxicity
+Processes & Impacts

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

@@ -0,0 +1,48 @@
+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/vertebrate.txt

@@ -1,4 +1,3 @@
-a. sylvaticus
 african clawed frog
 agalychnis callidryas
 albino rat
@@ -15,6 +14,7 @@ apodemus flavicollis
 apodemus syl vaticus
 apodemus sylvaticus
 arvicola terrestris
+a. sylvaticus
 avian
 bank vole
 bird
@@ -23,6 +23,7 @@ bluegill
 bluegill sunfish
 bobwhite
 bobwhite quail
+Bovine
 brachydanio rerio
 brown hare
 bufo americanus
@@ -52,10 +53,12 @@ crocidura russula
 crucian carp
 cyprinodon variegatus
 cyprinus carpio
+(Danio rerio
 dog
 dogs
 duck
 ducks
+Environmental & Molecular Mutagenesis
 european brown hare
 european rabbit
 fathead minnow
@@ -121,14 +124,13 @@ myodes glareolus
 northern bobwhite
 o. cuniculus
 o. mykiss
-o. tshawytscha
 oncorhynchus
 oncorhynchus mykiss
 oncorhynchus tshawytscha
 oryctolagus cuniculus
 oryzias melastigma
 oryzias melastigma larvae
-p. promelas
+o. tshawytscha
 pagrus major
 palumbus
 pig
@@ -139,10 +141,10 @@ pimephales promela
 pimephales promelas
 poecilia reticulata
 poultry
+p. promelas
 pseudacris
 pseudacris triseriata
 quail
-r. catesbeiana
 rabbit
 rabbits
 rainbow trout
@@ -152,6 +154,7 @@ rana limnocharis
 rana pipiens
 rat
 rats
+r. catesbeiana
 reptile
 reptiles
 ricefish
@@ -168,6 +171,7 @@ sorex araneus
 spea multiplicata
 spotted march frog
 tadpoles
+Taeniopygia guttata
 terrestrial vertrebrates
 toad
 treefrog
@@ -187,5 +191,6 @@ 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,116 +5,269 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Section
 global Section section
 
 
+// --------------------------------------- CBI rules -------------------------------------------------------------------
+
 rule "1: Redacted because Section contains Vertebrate"
-	when
-		eval(section.contains("vertebrate")==true);
-	then
-		section.redact("name", 1, "Redacted because Section contains Vertebrate");
-		section.redact("address", 1, "Redacted because Section contains Vertebrate");
-	end
+    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)");
+    end
 
 
 rule "2: Not Redacted because Section contains no Vertebrate"
-	when
-		eval(section.contains("vertebrate")==false);
-	then
-		section.redactNot("name", 2, "Not Redacted because Section contains no Vertebrate");
-		section.redactNot("address", 2, "Not Redacted because Section contains no Vertebrate");
-	end
+    when
+        Section(!matchesType("vertebrate"))
+    then
+        section.redactNot("CBI_author", 2, "No Vertebrate found");
+        section.redactNot("CBI_address", 2, "No Vertebrate found");
+    end
 
 
 rule "3: Do not redact Names and Addresses if no redaction Indicator is contained"
-	when
-		eval(section.contains("vertebrate")==true && section.contains("no_redaction_indicator")==true);
-	then
-		section.redactNot("name", 3, "Vertebrate was found, but also a no redaction indicator");
-		section.redactNot("address", 3, "Vertebrate was found, but also a no redaction indicator");
-	end
-
-
-rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
-	when
-		eval(section.contains("vertebrate")==true && section.contains("no_redaction_indicator")==true && section.contains("redaction_indicator")==true);
-	then
-		section.redact("name", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
-		section.redact("address", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
-	end
-
-
-rule "5: Do not redact in guideline sections"
-	when
-		eval(section.headlineContainsWord("guideline") || section.headlineContainsWord("Guidance"));
-	then
-		section.redactNot("name", 5, "Section is a guideline section.");
-		section.redactNot("address", 5, "Section is a guideline section.");
-	end
-
-rule "6: Redact contact information, if applicant is found"
-	when
-		eval(section.headlineContainsWord("applicant") || section.getText().contains("Applicant"));
-	then
-		section.redactLineAfter("Name:", "address", 6, "Applicant information was found");
-		section.redactBetween("Address:", "Contact", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Contact point:",  "address", 6, "Applicant information was found");
-		section.redactLineAfter("Phone:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Fax:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Tel.:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Tel:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("E-mail:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Email:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Contact:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Telephone number:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Fax number:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Telephone:", "address", 6, "Applicant information was found");
-		section.redactBetween("No:", "Fax", "address", 6, "Applicant information was found");
-		section.redactBetween("Contact:", "Tel.:", "address", 6, "Applicant information was found");
-	end
-
-rule "7: Redact contact information, if Producer is found"
-	when
-		eval(section.getText().toLowerCase().contains("producer of the plant protection") || section.getText().toLowerCase().contains("producer of the active substance") || section.getText().contains("Manufacturer of the active substance") || section.getText().contains("Manufacturer:") || section.getText().contains("Producer or producers of the active substance"));
-	then
-		section.redactLineAfter("Name:", "address", 7, "Producer was found");
-		section.redactBetween("Address:", "Contact", "address", 7, "Producer was found");
-		section.redactBetween("Contact:", "Phone", "address", 7, "Producer was found");
-		section.redactBetween("Contact:", "Telephone number:", "address", 7, "Producer was found");
-		section.redactBetween("Address:", "Manufacturing", "address", 7, "Producer was found");
-		section.redactLineAfter("Telephone:", "address", 7, "Producer was found");
-		section.redactLineAfter("Phone:", "address", 7, "Producer was found");
-		section.redactLineAfter("Fax:", "address", 7, "Producer was found");
-		section.redactLineAfter("E-mail:", "address", 7, "Producer was found");
-		section.redactLineAfter("Contact:", "address", 7, "Producer was found");
-		section.redactLineAfter("Fax number:", "address", 7, "Producer was found");
-		section.redactLineAfter("Telephone number:", "address", 7, "Producer was found");
-		section.redactLineAfter("Tel:", "address", 7, "Producer was found");
-		section.redactBetween("No:", "Fax", "address", 7, "Producer was found");
-	end
-
-
-rule "8: Not redacted because Vertebrate Study = N"
     when
-        Section(rowEquals("Vertebrate study Y/N", "N"))
+        Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
     then
-        section.redactNot("name", 8, "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");
+        section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
+        section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
     end
 
 
-rule "9: Redact if must redact entry is found"
-	when
-		eval(section.contains("must_redact")==true);
-	then
-		section.redact("name", 9, "must_redact entry was found.");
-		section.redact("address", 9, "must_redact entry was found.");
-	end
-
-
-rule "10: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study"
+rule "4: Do not redact Names and Addresses if no redaction Indicator is contained"
     when
-        Section(rowEquals("Vertebrate study Y/N", "Y"))
+        Section(matchesType("vertebrate"), matchesType("published_information"))
     then
-        section.redact("name", 10, "Redacted because row is a vertebrate study");
-        section.redact("address", 10, "Redacted because row is a vertebrate study");
-        section.highlightCell("Vertebrate study Y/N", 10, "must_redact");
+        section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
+        section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
     end
+
+
+rule "5: Redact Names and Addresses if no_redaction_indicator and redaction_indicator is contained"
+    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)");
+    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"
+    when
+        Section(matchesType("must_redact"))
+    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)");
+    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("determination of total residues")
+        ) && (
+            searchText.toLowerCase.contains("livestock") ||
+            searchText.toLowerCase.contains("live stock") ||
+            searchText.toLowerCase.contains("tissue") ||
+            searchText.toLowerCase.contains("tissues") ||
+            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("tissues", "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
+
+
+rule "12: Add recommendation for et al. author"
+    when
+        Section(searchText.contains("et al."))
+    then
+		section.addRecommendationByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]\\.?)?( [A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author");
+    end
+
+// --------------------------------------- PII rules -------------------------------------------------------------------
+
+
+rule "13: Redacted PII Personal Identification Information"
+    when
+        Section(matchesType("PII"))
+    then
+        section.redact("PII", 13, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "14: Redact Emails by RegEx"
+    when
+        Section(searchText.contains("@"))
+    then
+        section.redactByRegEx("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", true, 0, "PII", 14, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "15: 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", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Phone:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Fax:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Tel.:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Tel:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("E-mail:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Email:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("e-mail:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("E-mail address:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Contact:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Alternative contact:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone number:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone No:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Fax number:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("Telephone:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactBetween("No:", "Fax", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactBetween("Contact:", "Tel.:", "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+              section.redactLineAfter("European contact:",  "PII", 15, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+     end
+
+
+rule "16: Redact contact information if applicant is found"
+    when
+        Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Telephone number:"))
+    then
+        section.redactLineAfter("Contact point:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Phone:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel.:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Email:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("e-mail:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail address:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Alternative contact:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone number:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone No:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax number:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("No:", "Fax", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("Contact:", "Tel.:", "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("European contact:",  "PII", 16, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "17: 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", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Phone:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("E-mail:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Contact:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Fax number:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Telephone number:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLineAfter("Tel:", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("No:", "Fax", "PII", 17, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "18: Redact AUTHOR(S)"
+    when
+        Section(searchText.contains("AUTHOR(S):"))
+    then
+        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 18, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "19: Redact PERFORMING LABORATORY"
+    when
+        Section(searchText.contains("PERFORMING LABORATORY:"))
+    then
+        section.redactBetween("PERFORMING LABORATORY:", "LABORATORY PROJECT ID:", "PII", 19, true, "PERFORMING LABORATORY was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "20: Redact On behalf of Sequani Ltd.:"
+    when
+        Section(searchText.contains("On behalf of Sequani Ltd.: Name Title"))
+    then
+        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 20, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end
+
+
+rule "21: 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", 21, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+    end