Pull request #98 : idRemoval fix

Merge in RED/redaction-service from annotation-fix to master * commit 'e3a960d0861bdfa96b90fe406eb825573007530e': idRemoval fix
idRemoval fix
2021-01-08 10:40:22 +01:00 · 2021-01-08 11:29:47 +02:00 · 2021-01-07 16:32:19 +01:00 · 2021-01-07 16:20:51 +01:00 · 2021-01-07 13:18:43 +01:00 · 2021-01-07 13:07:21 +01:00
26 changed files with 1086 additions and 800 deletions
@@ -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>
@@ -1,29 +1,32 @@
 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
 public class RedactionLog {

-    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion) {
+    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;
    }

-    private List<RedactionLogEntry> redactionLogEntry;
-
-    private long dictionaryVersion = -1;
-
-    private long rulesVersion = -1;
-
-    private String filename;

 }
@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 public class RedactionRequest {

    private byte[] document;
+    private String ruleSetId;
    private boolean flatRedaction;
    private ManualRedactions manualRedactions;
 }
@@ -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);

 }
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.3.7</version>
+            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -1,16 +1,8 @@
 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;
@@ -18,54 +10,17 @@ 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, 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);
-        }
-
-    }
-
 }
@@ -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 {
 }
@@ -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 {
 }
@@ -1,14 +1,5 @@
 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;
@@ -25,9 +16,17 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractT
 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.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
@@ -51,16 +50,21 @@ public class RedactionController implements RedactionResource {

            log.info("Document structure analysis successful, starting redaction analysis...");

-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
+            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getRuleSetId(), redactionRequest.getManualRedactions());
            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
-                    .getManualRedactions());
+                    .getManualRedactions(), redactionRequest.getRuleSetId());

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

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

-        } catch (IOException e) {
+        } catch (Exception e) {
            throw new RedactionException(e);
        }

@@ -76,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);
@@ -94,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);
@@ -131,28 +135,32 @@ public class RedactionController implements RedactionResource {


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

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


-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
+    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {

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


    private RedactionResult convert(PDDocument document, int numberOfPages,
                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {
+                                    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,dictionaryVersion, rulesVersion))
+                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
                    .sectionGrid(sectionGrid)
                    .build();
        }
@@ -212,7 +212,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                maxCharWidths = charWidth;
            }

-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
                startIndex++;
                continue;
            }
@@ -220,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;
@@ -236,14 +236,13 @@ 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
@@ -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<>();
+
+
+
+}
@@ -2,17 +2,19 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;

 import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;

-import java.util.ArrayList;
+import java.util.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;
@@ -45,6 +47,10 @@ public class Section {

    private Map<String, CellValue> tabularData;

+    private Dictionary dictionary;
+
+    private SearchableText searchableText;
+

    public boolean rowEquals(String headerName, String value) {

@@ -70,10 +76,10 @@ public class Section {

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

-        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
@@ -86,10 +92,10 @@ public class Section {

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

-        boolean hasRecommendactionDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendactionDictionary && entity.getType()
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
@@ -114,8 +120,8 @@ public class Section {

    public void addHintAnnotation(String value, String asType) {

-        Set<Entity> found = findEntities(value.trim(), asType, true);
-        entities.addAll(found);
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
+        addNewerToEntities(found);
    }


@@ -127,24 +133,41 @@ public class Section {
        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
-                    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);
-                entity.setLegalBasis(legalBasis);
+
+    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);
+            }
+        }
    }


@@ -156,30 +179,21 @@ public class Section {
        if (values != null) {
            for (String value : values) {
                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false);
-                    // HashSet keeps the older value, but we want the new only.
-                    entities.removeAll(found);
-                    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);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
    }


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

        String[] values = StringUtils.substringsBetween(text, start, stop);
@@ -195,11 +209,9 @@ public class Section {
                            return;
                        }

-                        Set<Entity> found = findEntities(line.trim(), asType, false);
+                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
+                        addNewerToEntities(found);

-                        // HashSet keeps the older value, but we want the new only.
-                        entities.removeAll(found);
-                        entities.addAll(found);
                        if (redactEverywhere && !isLocal()) {
                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
                        }
@@ -207,65 +219,6 @@ public class Section {
                }
            }
        }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
-    private Set<Entity> findEntities(String value, String asType, boolean caseinsensitive) {
-
-        if (value.trim().length() <= 2) {
-            return new HashSet<>();
-        }
-
-        Set<Entity> found = new HashSet<>();
-
-        String text = caseinsensitive ? searchText.toLowerCase() : searchText;
-        String searchValue = caseinsensitive ? value.toLowerCase() : value;
-
-        int startIndex;
-        int stopIndex = 0;
-        do {
-            startIndex = text.indexOf(searchValue, stopIndex);
-            stopIndex = startIndex + searchValue.length();
-
-            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(text.charAt(startIndex - 1)) || isSeparator(text
-                    .charAt(startIndex - 1))) && (stopIndex == text.length() || isSeparator(text.charAt(stopIndex)))) {
-                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber, false));
-            }
-        } while (startIndex > -1);
-
-        return removeEntitiesContainedInLarger(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);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-        return entities;
    }


@@ -275,7 +228,8 @@ public class Section {
    }


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

        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
@@ -289,6 +243,27 @@ public class Section {
    }


+    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) {

@@ -305,15 +280,19 @@ public class Section {
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
            entity.setTargetSequences(value.getTextBlocks()
-                    .get(0)
-                    .getSequences()); // Make sure no other cells with same content are highlighted
+                    .stream()
+                    .map(TextBlock::getSequences)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
            entity.setLegalBasis(legalBasis);

-            // HashSet keeps the older value, but we want the new only.
-            entities.remove(entity);
-            entities.add(entity);
+            Set<Entity> singleEntitySet = new HashSet<>();
+            singleEntitySet.add(entity);
+            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary);

-            entities = removeEntitiesContainedInLarger(entities);
+            addNewerToEntities(entity);
+
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);

            if (addAsRecommendations && !isLocal()) {
                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
@@ -334,6 +313,19 @@ public class Section {
        }
    }

+
+    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);
+    }
+
 }


@@ -1,5 +1,19 @@
 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;
@@ -10,22 +24,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.SerializationUtils;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
-import com.iqser.red.service.configuration.v1.api.model.TypeResult;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
-
-import feign.FeignException;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
@Slf4j
@Service
@RequiredArgsConstructor
@@ -34,60 +32,51 @@ public class DictionaryService {

    private final DictionaryClient dictionaryClient;

-    @Getter
-    private long dictionaryVersion = -1;

-    @Getter
-    private List<DictionaryModel> dictionary = new ArrayList<>();
-
-    @Getter
-    private float[] defaultColor;
-
-    @Getter
-    private float[] requestAddColor;
-
-    @Getter
-    private float[] requestRemoveColor;
-
-    @Getter
-    private float[] notRedactedColor;
+    private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();


-    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+    public void updateDictionary(String ruleSetId) {

+        long version = dictionaryClient.getVersion(ruleSetId);

+        var foundDictionary = dictionariesByRuleSets.get(ruleSetId);

-    public void updateDictionary() {
-
-        long version = dictionaryClient.getVersion();
-        if (version > dictionaryVersion) {
-            dictionaryVersion = version;
-            updateDictionaryEntry();
+        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())) {

-                dictionary = typeResponse.getTypes()
+                List<DictionaryModel> dictionary = typeResponse.getTypes()
                        .stream()
                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

-                localAccessMap.clear();
-                dictionary.forEach(dm -> localAccessMap.put(dm.getType(), dm));

-                Colors colors = dictionaryClient.getColors();
-                defaultColor = convertColor(colors.getDefaultColor());
-                requestAddColor = convertColor(colors.getRequestAdd());
-                requestRemoveColor = convertColor(colors.getRequestRemove());
-                notRedactedColor = convertColor(colors.getNotRedacted());
+                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);
@@ -96,12 +85,12 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary){
+    public void updateExternalDictionary(Dictionary dictionary, String ruleSetId) {
        dictionary.getDictionaryModels().forEach(dm -> {
-            if(dm.isRecommendation() && !dm.getLocalEntries().isEmpty()){
-                dictionaryClient.addEntries(dm.getType(), new ArrayList<>(dm.getLocalEntries()), false);
-                long externalVersion = dictionaryClient.getVersion();
-                if(externalVersion == dictionary.getVersion() + 1){
+            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);
                }
            }
@@ -112,13 +101,13 @@ public class DictionaryService {
    private Set<String> convertEntries(TypeResult t) {

        if (t.isCaseInsensitive()) {
-            return dictionaryClient.getDictionaryForType(t.getType())
+            return dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId())
                    .getEntries()
                    .stream()
                    .map(String::toLowerCase)
                    .collect(Collectors.toSet());
        } else {
-            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType()).getEntries());
+            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId()).getEntries());
        }
    }

@@ -130,9 +119,9 @@ public class DictionaryService {
    }


-    public boolean isCaseInsensitiveDictionary(String type) {
+    public boolean isCaseInsensitiveDictionary(String type, String ruleSetId) {

-        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        DictionaryModel dictionaryModel = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (dictionaryModel != null) {
            return dictionaryModel.isCaseInsensitive();
        }
@@ -140,28 +129,28 @@ public class DictionaryService {
    }


-    public float[] getColor(String type) {
+    public float[] getColor(String type, String ruleSetId) {

-        DictionaryModel model = localAccessMap.get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.getColor();
        }
-        return defaultColor;
+        return dictionariesByRuleSets.get(ruleSetId).getDefaultColor();
    }


-    public boolean isHint(String type) {
+    public boolean isHint(String type, String ruleSetId) {

-        DictionaryModel model = localAccessMap.get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isHint();
        }
        return false;
    }

-    public boolean isRecommendation(String type) {
+    public boolean isRecommendation(String type, String ruleSetId) {

-        DictionaryModel model = localAccessMap.get(type);
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
        if (model != null) {
            return model.isRecommendation();
        }
@@ -169,14 +158,27 @@ public class DictionaryService {
    }


-    public Dictionary getDeepCopyDictionary(){
+    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, dictionaryVersion);
+        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();
+    }
 }
@@ -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();
+    }
 }
@@ -6,12 +6,14 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;

 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
@@ -28,6 +30,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionS
 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;

@@ -44,15 +47,15 @@ public class EntityRedactionService {
    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();

-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary();
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId);

-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, manualRedactions, dictionary, false, null));
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));

        if (dictionary.hasLocalEntries()) {

@@ -64,12 +67,12 @@ public class EntityRedactionService {
                }
            });

-            Set<Entity> foundByLocal = findEntities(classifiedDoc, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            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);

-            removeEntitiesContainedInLarger(documentEntities);
+            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

        for (Entity entity : documentEntities) {
@@ -88,99 +91,39 @@ public class EntityRedactionService {
            }
        }

-        dictionaryService.updateExternalDictionary(dictionary);
+        dictionaryService.updateExternalDictionary(dictionary, ruleSetId);

        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
        classifiedDoc.setRulesVersion(rulesVersion);
    }


-    private Set<Entity> findEntities(Document classifiedDoc, ManualRedactions manualRedactions, Dictionary dictionary,
-                                     boolean local, Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
+                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {

        Set<Entity> documentEntities = new HashSet<>();
-        int sectionNumber = 1;
+
+        AtomicInteger sectionNumber = new AtomicInteger(1);
        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {

-            SearchableText searchableText = paragraph.getSearchableText();
-
            List<Table> tables = paragraph.getTables();
-
            for (Table table : tables) {
-                boolean singleCellTable = table.getRowCount() == 1 && table.getColCount() == 1;
-                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 (!singleCellTable && 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(), 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, dictionary
-                            .getDictionaryModels(), local);
-                    surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
-
-                    sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                            .isLocal(local)
-                            .dictionaryTypes(dictionary.getTypes())
-                            .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
-                                    .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
-                                    .collect(Collectors.toSet()) : rowEntities)
-                            .text(searchableRow.getAsStringWithLinebreaks())
-                            .searchText(searchableRow.toString())
-                            .headline(table.getHeadline())
-                            .sectionNumber(sectionNumber)
-                            .tabularData(tabularData)
-                            .build(), searchableRow));
-
-                    sectionNumber++;
+                if (table.getColCount() == 2) {
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                } else {
+                    sectionSearchableTextPairs.addAll(processTablePerRow(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                }
-                sectionNumber++;
+                sectionNumber.incrementAndGet();
            }
-
-            addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber);
-            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber, dictionary.getDictionaryModels(), local);
-            surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
-
-            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                    .isLocal(local)
-                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber) ? Stream
-                            .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber).stream())
-                            .collect(Collectors.toSet()) : entities)
-                    .text(searchableText.getAsStringWithLinebreaks())
-                    .searchText(searchableText.toString())
-                    .headline(paragraph.getHeadline())
-                    .sectionNumber(sectionNumber)
-                    .build(), searchableText));
-
-            sectionNumber++;
+            sectionSearchableTextPairs.add(processText(paragraph, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionNumber.incrementAndGet();
        }

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

            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
                if (dictionary.isRecommendation(key)) {
@@ -211,23 +154,132 @@ public class EntityRedactionService {
    }


-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+    private List<SectionSearchableTextPair> processTablePerRow(Table table, ManualRedactions manualRedactions,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary,
+                                                               boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {

-        removeEntitiesContainedInLarger(entities);
+        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 (Entity entity : entities) {
-            if (entity.getPositionSequences().isEmpty()) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), dictionary.isCaseInsensitiveDictionary(entity
-                        .getType()), entity.getTargetSequences()));
+                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 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,
-                                     List<DictionaryModel> dictionary, boolean local) {
+                                     Dictionary dictionary, boolean local) {

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

        String lowercaseInputString = searchableString.toLowerCase();
-        for (DictionaryModel model : dictionary) {
+        for (DictionaryModel model : dictionary.getDictionaryModels()) {
            if (model.isCaseInsensitive()) {
                found.addAll(find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            } else {
                found.addAll(find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            }
        }
-        removeEntitiesContainedInLarger(found);
-        return found;
+
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);

    }

@@ -282,22 +334,6 @@ public class EntityRedactionService {
    }


-    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);
-    }
-
-
    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
                                              String section, int sectionNumber) {

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

-import java.util.List;
-import java.util.Set;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;

@Slf4j
@Service
@@ -94,7 +92,7 @@ public class SurroundingWordsService {
            int numberOfWordsBefore = wordsBefore.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
                    .getNumberOfSurroundingWords() : wordsBefore.length;
            if (wordsBefore.length > 0) {
-                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore));
+                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore, textBefore.endsWith(" ")));
            }
        }

@@ -106,13 +104,13 @@ public class SurroundingWordsService {
            int numberOfWordsAfter = wordsAfter.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
                    .getNumberOfSurroundingWords() : wordsAfter.length;
            if (wordsAfter.length > 0) {
-                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter));
+                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter, textAfter.startsWith(" ")));
            }
        }
    }


-    private String concatWordsBefore(String[] words, int number) {
+    private String concatWordsBefore(String[] words, int number, boolean endWithSpace) {

        StringBuilder sb = new StringBuilder();

@@ -122,11 +120,12 @@ public class SurroundingWordsService {
            sb.append(words[i]).append(" ");
        }

-        return sb.toString().trim();
+        String result = sb.toString().trim();
+        return endWithSpace ? result + " " : result;
    }


-    private String concatWordsAfter(String[] words, int number) {
+    private String concatWordsAfter(String[] words, int number, boolean startWithSpace) {

        StringBuilder sb = new StringBuilder();

@@ -134,7 +133,8 @@ public class SurroundingWordsService {
            sb.append(words[i]).append(" ");
        }

-        return sb.toString().trim();
+        String result = sb.toString().trim();
+        return startWithSpace ? " " + result : result;
    }

 }
@@ -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);
+    }
+}
@@ -1,12 +1,28 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;

-import java.util.regex.Pattern;
-
 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;
+    }
+
 }
@@ -1,28 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.visualization.service;

-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 org.apache.commons.collections4.CollectionUtils;
-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.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.CellRectangle;
 import com.iqser.red.service.redaction.v1.model.Comment;
 import com.iqser.red.service.redaction.v1.model.IdRemoval;
@@ -44,8 +21,29 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.DictionarySer
 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;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+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 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;

@Service
@RequiredArgsConstructor
@@ -55,7 +53,7 @@ public class AnnotationHighlightService {


    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction,
-                          ManualRedactions manualRedactions) throws IOException {
+                          ManualRedactions manualRedactions, String ruleSetId) throws IOException {

        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);

@@ -66,11 +64,11 @@ public class AnnotationHighlightService {
            drawSectionFrames(document, classifiedDoc, flatRedaction, pdPage, page);

            if (classifiedDoc.getEntities().get(page) != null) {
-                addAnnotations(pdPage, classifiedDoc, flatRedaction, manualRedactions, page);
+                addAnnotations(pdPage, classifiedDoc, flatRedaction, manualRedactions, page, ruleSetId);
            }

            if (manualRedactionPages.contains(page)) {
-                addManualAnnotations(pdPage, classifiedDoc, manualRedactions, page);
+                addManualAnnotations(pdPage, classifiedDoc, manualRedactions, page, ruleSetId);
            }
        }
    }
@@ -94,7 +92,7 @@ public class AnnotationHighlightService {


    private void addAnnotations(PDPage pdPage, Document classifiedDoc, boolean flatRedaction,
-                                ManualRedactions manualRedactions, int page) throws IOException {
+                                ManualRedactions manualRedactions, int page, String ruleSetId) throws IOException {

        List<PDAnnotation> annotations = pdPage.getAnnotations();

@@ -104,7 +102,7 @@ public class AnnotationHighlightService {
        entityLoop:
        for (Entity entity : classifiedDoc.getEntities().get(page)) {

-            if (flatRedaction && !isRedactionType(entity)) {
+            if (flatRedaction && !isRedactionType(entity, ruleSetId)) {
                continue;
            }

@@ -113,7 +111,7 @@ public class AnnotationHighlightService {

            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

-                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, ruleSetId);
                if (processedIds.contains(entityPositionSequence.getId())) {

                    // TODO refactor this outer loop jump as soon as we have the time.
@@ -127,7 +125,7 @@ public class AnnotationHighlightService {
                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
                            comments = manualRedactions.getComments().get(manualRemoval.getId());
                            String manualOverrideReason = null;
-                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                            if (manualRemoval.getStatus().equals(Status.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
                                entity.setRedaction(false);
                                redactionLogEntry.setRedacted(false);
                                redactionLogEntry.setStatus(Status.APPROVED);
@@ -161,7 +159,7 @@ public class AnnotationHighlightService {

                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

-                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, requestedToRemove), comments, !isHint(entity)));
+                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, ruleSetId, requestedToRemove), comments, !isHint(entity, ruleSetId)));
                }

                redactionLogEntry.setId(entityPositionSequence.getId());
@@ -203,7 +201,7 @@ public class AnnotationHighlightService {


    private void addManualAnnotations(PDPage pdPage, Document classifiedDoc, ManualRedactions manualRedactions,
-                                      int page) throws IOException {
+                                      int page, String ruleSetId) throws IOException {

        if (manualRedactions == null) {
            return;
@@ -215,7 +213,7 @@ public class AnnotationHighlightService {

            String id = manualRedactionEntry.getId();

-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id);
+            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, ruleSetId);

            List<Rectangle> rectanglesOnPage = new ArrayList<>();
            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
@@ -227,7 +225,7 @@ public class AnnotationHighlightService {

            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
                annotations.addAll(createAnnotation(rectanglesOnPage, id, createAnnotationContent(manualRedactionEntry), getColorForManualAdd(manualRedactionEntry
-                        .getType(), manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true));
+                        .getType(), ruleSetId, manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true));
                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
            }
        }
@@ -240,11 +238,11 @@ public class AnnotationHighlightService {
    }


-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id) {
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id, String ruleSetId) {

        return RedactionLogEntry.builder()
                .id(id)
-                .color(getColor(manualRedactionEntry.getType()))
+                .color(getColor(manualRedactionEntry.getType(), ruleSetId))
                .reason(manualRedactionEntry.getReason())
                .legalBasis(manualRedactionEntry.getLegalBasis())
                .value(manualRedactionEntry.getValue())
@@ -261,17 +259,17 @@ public class AnnotationHighlightService {
    }


-    private RedactionLogEntry createRedactionLogEntry(Entity entity) {
+    private RedactionLogEntry createRedactionLogEntry(Entity entity, String ruleSetId) {

        return RedactionLogEntry.builder()
-                .color(getColor(entity, false))
+                .color(getColor(entity, ruleSetId, false))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity))
-                .isRecommendation(isRecommendation(entity))
+                .isHint(isHint(entity, ruleSetId))
+                .isRecommendation(isRecommendation(entity, ruleSetId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -389,49 +387,49 @@ public class AnnotationHighlightService {
    }


-    private boolean isRedactionType(Entity entity) {
+    private boolean isRedactionType(Entity entity, String ruleSetId) {

        if (!entity.isRedaction()) {
            return false;
        }
-        return !isHint(entity);
+        return !isHint(entity, ruleSetId);
    }


-    private float[] getColor(Entity entity, boolean requestedToRemove) {
+    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {

        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor();
+            return dictionaryService.getRequestRemoveColor(ruleSetId);
        }
-        if (!entity.isRedaction() && !isHint(entity)) {
-            return dictionaryService.getNotRedactedColor();
+        if (!entity.isRedaction() && !isHint(entity, ruleSetId)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
        }
-        return dictionaryService.getColor(entity.getType());
+        return dictionaryService.getColor(entity.getType(), ruleSetId);
    }


-    private float[] getColorForManualAdd(String type, Status status) {
+    private float[] getColorForManualAdd(String type, String ruleSetId, Status status) {

        if (status.equals(Status.REQUESTED)) {
-            return dictionaryService.getRequestAddColor();
+            return dictionaryService.getRequestAddColor(ruleSetId);
        } else if (status.equals(Status.DECLINED)) {
-            return dictionaryService.getNotRedactedColor();
+            return dictionaryService.getNotRedactedColor(ruleSetId);
        }
-        return getColor(type);
+        return getColor(type, ruleSetId);
    }


-    private float[] getColor(String type) {
-        return dictionaryService.getColor(type);
+    private float[] getColor(String type, String ruleSetId) {
+        return dictionaryService.getColor(type, ruleSetId);
    }


-    private boolean isHint(Entity entity) {
-        return dictionaryService.isHint(entity.getType());
+    private boolean isHint(Entity entity, String ruleSetId) {
+        return dictionaryService.isHint(entity.getType(), ruleSetId);
    }

-    private boolean isRecommendation(Entity entity) {
-        return dictionaryService.isRecommendation(entity.getType());
+    private boolean isRecommendation(Entity entity, String ruleSetId) {
+        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
    }


@@ -0,0 +1,4 @@
+server:
+  port: 8083
+
+configuration-service.url: "http://localhost:8081"
@@ -1,6 +1,8 @@
 info:
  description: Redaction Service Server V1

+configuration-service.url: "http://configuration-service-v1:8080"
+
 server:
  port: 8080

@@ -1,45 +1,5 @@
 package com.iqser.red.service.redaction.v1.server;

-import static org.assertj.core.api.Assertions.assertThat;
-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.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 org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-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 org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-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.Colors;
 import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
 import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
@@ -60,9 +20,48 @@ 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;
+import org.junit.runner.RunWith;
+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 org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+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");
@@ -100,6 +99,8 @@ public class RedactionIntegrationTest {
    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 {

@@ -125,28 +126,28 @@ 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(VERTEBRATE)).thenReturn(getDictionaryResponse(VERTEBRATE));
-        when(dictionaryClient.getDictionaryForType(ADDRESS)).thenReturn(getDictionaryResponse(ADDRESS));
-        when(dictionaryClient.getDictionaryForType(AUTHOR)).thenReturn(getDictionaryResponse(AUTHOR));
-        when(dictionaryClient.getDictionaryForType(SPONSOR)).thenReturn(getDictionaryResponse(SPONSOR));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT)).thenReturn(getDictionaryResponse(MUST_REDACT));
-        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION));
-        when(dictionaryClient.getDictionaryForType(TEST_METHOD)).thenReturn(getDictionaryResponse(TEST_METHOD));
-        when(dictionaryClient.getDictionaryForType(PII)).thenReturn(getDictionaryResponse(PII));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR));
-        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
-        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
-        when(dictionaryClient.getColors()).thenReturn(colors);
+        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);
    }


@@ -306,6 +307,7 @@ public class RedactionIntegrationTest {
                .stream()
                .map(typeColor -> TypeResult.builder()
                        .type(typeColor.getKey())
+                        .ruleSetId(TEST_RULESET_ID)
                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
@@ -342,6 +344,7 @@ 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());
@@ -387,9 +390,10 @@ public class RedactionIntegrationTest {

        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.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);
@@ -420,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();

@@ -471,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();
@@ -565,6 +571,7 @@ public class RedactionIntegrationTest {
        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);
@@ -586,9 +593,10 @@ public class RedactionIntegrationTest {
        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();
-        request.setFlatRedaction(false);

        RedactionResult result = redactionController.redact(request);

@@ -1,25 +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.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
+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;
@@ -38,18 +31,25 @@ 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.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.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)
@@ -78,6 +78,8 @@ public class EntityRedactionServiceTest {
    @Autowired
    private DroolsExecutionService droolsExecutionService;

+    private final static String TEST_RULESET_ID = "123";
+
    @TestConfiguration
    public static class RedactionIntegrationTestConfiguration {

@@ -108,7 +110,7 @@ public class EntityRedactionServiceTest {
        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);
@@ -128,21 +130,21 @@ 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(AUTHOR_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)).thenReturn(sponsorResponse);
+        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 author cells, 1 address, 1 Y and 2 N entities
        }
@@ -161,20 +163,20 @@ 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(AUTHOR_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)).thenReturn(sponsorResponse);
+        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 author cells, 1 address, 1 Y and 2 N entities
        }
@@ -186,22 +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/CBI_author.txt")))
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        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)).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)).thenReturn(sponsorResponse);
+        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()
@@ -211,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()
@@ -223,22 +225,22 @@ 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/CBI_author.txt")))
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        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)).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)).thenReturn(sponsorResponse);
+        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() == 9)
@@ -287,31 +289,31 @@ public class EntityRedactionServiceTest {
                "\"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()).thenReturn(RULES_VERSION.incrementAndGet());
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
-        droolsExecutionService.updateRules();
+        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()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        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)).thenReturn(dictionaryResponse);
+        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)).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)).thenReturn(sponsorResponse);
+        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() == 6)
-                    .count()).isEqualTo(18);
+                    .count()).isEqualTo(13);
        }

    }
@@ -328,27 +330,27 @@ public class EntityRedactionServiceTest {
                "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()).thenReturn(RULES_VERSION.incrementAndGet());
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
-        droolsExecutionService.updateRules();
+        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()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
        DictionaryResponse authorResponse = DictionaryResponse.builder()
                .entries(Collections.emptyList())
                .build();
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(authorResponse);
+        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)).thenReturn(dictionaryResponse);
+        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, 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() == 11)
@@ -367,20 +369,20 @@ public class EntityRedactionServiceTest {
                .entries(Arrays.asList("Bissig R.", "Thanei P."))
                .build();

-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_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)).thenReturn(sponsorResponse);
+        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(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
@@ -392,16 +394,16 @@ public class EntityRedactionServiceTest {
                .entries(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C."))
                .build();

-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE)).thenReturn(dictionaryResponse);
+        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)).thenReturn(addressResponse);
+        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);
+            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);
@@ -418,20 +420,20 @@ public class EntityRedactionServiceTest {
                .entries(Collections.singletonList("Aldershof S."))
                .build();

-        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
-        when(dictionaryClient.getDictionaryForType(AUTHOR_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)).thenReturn(sponsorResponse);
+        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);
        }
@@ -463,27 +465,27 @@ public class EntityRedactionServiceTest {
                " 1107/2009 Art. 63 (2g)\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
                "    end";
-        when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
-        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(AUTHOR_CODE).hexColor("#ffff00").build(),
-                        TypeResult.builder().type(ADDRESS_CODE).hexColor("#ff00ff").build(),
-                        TypeResult.builder().type(SPONSOR_CODE).hexColor("#00ffff").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.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)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
                .build();
-        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);

        Colors colors = new Colors();
        colors.setDefaultColor("#acfc00");
@@ -491,7 +493,7 @@ public class EntityRedactionServiceTest {
        colors.setRequestAdd("#04b093");
        colors.setRequestRemove("#04b093");

-        when(dictionaryClient.getColors()).thenReturn(colors);
+        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
    }


@@ -513,28 +515,4 @@ public class EntityRedactionServiceTest {
        }
    }

-
-    @Test
-    public void testAuthorSplitting(){
-
-        String word = "Porch JR, " + "Kendall TZ, " + "Krueger HO";
-
-        word.replaceAll(",", " ").replaceAll("  ", " ");
-
-        Pattern pattern = Pattern.compile("[A-ZÄÖÜ][\\wäöüéèê]{2,}( [A-ZÄÖÜ]{1,2}\\.)+");
-        Matcher matcher = pattern.matcher(word);
-
-        List<String> allMatches = new ArrayList<>();
-        while (matcher.find()) {
-            allMatches.add(matcher.group());
-        }
-
-        for(String name: allMatches) {
-            if(name.length() >= 3) {
-                System.out.println(name);
-//                dictionaryService.addToLocalDictionary(type, name);
-            }
-        }
-    }
-
 }
@@ -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);
+            }
+        }
+    }
+}
@@ -1,9 +1,9 @@
+configuration-service.url: "http://configuration-service-v1:8080"

 ribbon:
  ConnectTimeout: 600000
  ReadTimeout: 600000

-
 spring:
  main:
    allow-bean-definition-overriding: true
@@ -8,48 +8,48 @@ global Section section
 // --------------------------------------- CBI rules -------------------------------------------------------------------

 rule "1: Redacted because Section contains Vertebrate"
-	when
-		Section(matchesType("vertebrate"))
-	then
-		section.redact("CBI_author", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("CBI_address", 1, "Vertebrate found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-	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
-		Section(!matchesType("vertebrate"))
-	then
-		section.redactNot("CBI_author", 2, "No Vertebrate found");
-		section.redactNot("CBI_address", 2, "No Vertebrate found");
-	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
-		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
-	then
-		section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
-		section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
-	end
+    when
+        Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"))
+    then
+        section.redactNot("CBI_author", 3, "Vertebrate and No Redaction Indicator found");
+        section.redactNot("CBI_address", 3, "Vertebrate and No Redaction Indicator found");
+    end


 rule "4: Do not redact Names and Addresses if no redaction Indicator is contained"
-	when
-		Section(matchesType("vertebrate"), matchesType("published_information"))
-	then
-		section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
-		section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
-	end
+    when
+        Section(matchesType("vertebrate"), matchesType("published_information"))
+    then
+        section.redactNot("CBI_author", 4, "Vertebrate and Published Information found");
+        section.redactNot("CBI_address", 4, "Vertebrate and Published Information found");
+    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
+    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"
@@ -64,12 +64,12 @@ rule "6: Not redacted because Vertebrate Study = N"


 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
+    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"
@@ -92,55 +92,75 @@ rule "9: Redact sponsor company"


 rule "10: Redact determination of residues"
-	when
-		Section(searchText.toLowerCase.contains("determination of residues") && (
-			searchText.toLowerCase.contains("livestock") ||
-			searchText.toLowerCase.contains("live stock") ||
-			searchText.toLowerCase.contains("tissue") ||
-			searchText.toLowerCase.contains("liver") ||
-			searchText.toLowerCase.contains("muscle") ||
-			searchText.toLowerCase.contains("bovine") ||
-			searchText.toLowerCase.contains("ruminant") ||
-			searchText.toLowerCase.contains("ruminants")
-		))
-	then
-		section.redact("CBI_author", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.redact("CBI_address", 10, "Determination of residues was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-		section.addHintAnnotation("determination of residues", "must_redact");
-		section.addHintAnnotation("livestock", "must_redact");
-		section.addHintAnnotation("live stock", "must_redact");
-		section.addHintAnnotation("tissue", "must_redact");
-		section.addHintAnnotation("liver", "must_redact");
-		section.addHintAnnotation("muscle", "must_redact");
-		section.addHintAnnotation("bovine", "must_redact");
-		section.addHintAnnotation("ruminant", "must_redact");
-		section.addHintAnnotation("ruminants", "must_redact");
-	end
+    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");
+        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 "12: Redacted PII Personal Identification Information"
-	when
-		Section(matchesType("PII"))
-	then
-		section.redact("PII", 12, "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-	end
+rule "13: 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 "13: Redact contact information"
+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:")
@@ -158,96 +178,96 @@ rule "13: Redact contact information"
       || text.contains("Telephone:")
       || text.contains("European contact:"))
    then
-      	section.redactLineAfter("Contact point:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Phone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Fax:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Tel:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("E-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Email:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("e-mail:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("E-mail address:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Alternative contact:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Telephone number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Telephone No:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Fax number:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("Telephone:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactBetween("No:", "Fax", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactBetween("Contact:", "Tel.:", "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-      		section.redactLineAfter("European contact:",  "PII", 13, true, "Contact information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+          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 "14: Redact contact information if applicant is found"
-	when
-		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact") || text.contains("Contact:") || text.contains("Telephone number:"))
-	then
-		section.redactLineAfter("Contact point:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Phone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Email:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("e-mail:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail address:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Alternative contact:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone No:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax number:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("No:", "Fax", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("Contact:", "Tel.:", "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("European contact:",  "PII", 14, true, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-	end
+rule "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 "15: Redact contact information if Producer is found"
-	when
-		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
-	then
-		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Phone:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("E-mail:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Contact:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Fax number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Telephone number:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactLineAfter("Tel:", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-		section.redactBetween("No:", "Fax", "PII", 15, true, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
-	end
+rule "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 "16: Redact AUTHOR(S)"
+rule "18: Redact AUTHOR(S)"
    when
        Section(searchText.contains("AUTHOR(S):"))
    then
-        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 16, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactLinesBetween("AUTHOR(S):", "COMPLETION DATE:", "PII", 18, true, "AUTHOR(S) was found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


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


-rule "18: Redact On behalf of Sequani Ltd.:"
+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", 18, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Sequani Ltd.: Name Title", "On behalf of", "PII", 20, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end


-rule "19: Redact On behalf of Syngenta Ltd.:"
+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", 19, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
+        section.redactBetween("On behalf of Syngenta Ltd.: Name Title", "Study dates", "PII", 21, false , "PII (Personal Identification Information) found", "Reg (EC) No 1107/2009 Art. 63 (2e)");
    end
Author	SHA1	Message	Date
Timo Bejan	f693667fbb	Pull request #98 : idRemoval fix Merge in RED/redaction-service from annotation-fix to master * commit 'e3a960d0861bdfa96b90fe406eb825573007530e': idRemoval fix	2021-01-08 10:40:22 +01:00
Timo	e3a960d086	idRemoval fix	2021-01-08 11:29:47 +02:00
Dominique Eiflaender	a8fdfc4edd	Pull request #97 : Avoid IndexOutOfBoundsException if dictionary entry has blank at end Merge in RED/redaction-service from IndexOutOfBoundsBlankFix to master * commit 'e23ed69e04aa0507eee022cd590a51422a1b09d3': Avoid IndexOutOfBoundsException if dictionary entry has blank at end	2021-01-07 16:32:19 +01:00
Dominique Eifländer	e23ed69e04	Avoid IndexOutOfBoundsException if dictionary entry has blank at end	2021-01-07 16:20:51 +01:00
Dominique Eiflaender	caf20e4776	Pull request #96 : Fixed RegEx for et al. Merge in RED/redaction-service from EtAlRegEx to master * commit '633fb403e0ac82a88fd8a0d334685fec986c016f': Fixed RegEx for et al. recommendations	2021-01-07 13:18:43 +01:00
Dominique Eifländer	633fb403e0	Fixed RegEx for et al. recommendations	2021-01-07 13:07:21 +01:00
Timo Bejan	e58b4ff6c1	Pull request #95 : Feature/ruleset integration Merge in RED/redaction-service from feature/ruleset-integration to master * commit '2c4350b8f369c00177781edc4567df1f2806a2fe': Rules Tester rule update fix	2021-01-06 18:47:57 +01:00
Timo	2c4350b8f3	Rules Tester	2021-01-06 19:37:39 +02:00
Timo	07ffeab3ae	rule update fix	2021-01-06 19:30:40 +02:00
Timo Bejan	f087d4afdb	Pull request #94 : dev mode features, exception generalisation Merge in RED/redaction-service from feature/ruleset-integration to master * commit 'c2669ab56843f3ec335cfb1cd7d1e59dc828fb98': fixed tests fixed tests dev mode features, exception generalisation	2021-01-06 16:23:56 +01:00
Timo	c2669ab568	fixed tests	2021-01-06 17:04:07 +02:00
Timo	a824aa20a5	fixed tests	2021-01-06 17:02:43 +02:00
Timo	6412cf37d9	dev mode features, exception generalisation	2021-01-06 16:41:16 +02:00
Dominique Eiflaender	43d20ad1e7	Pull request #93 : RED-727: Added possibility to redact/addRecommendations by regEx in rules. Merge in RED/redaction-service from RED-727 to master * commit 'de725a630c06fbc6c6bef6229fcf3ba5c859ef73': RED-727: Added possibility to redact/addRecommendations by regEx in rules. Added email regEx and et al. author recommendation regEx	2021-01-06 15:06:37 +01:00
Dominique Eifländer	de725a630c	RED-727: Added possibility to redact/addRecommendations by regEx in rules. Added email regEx and et al. author recommendation regEx	2021-01-06 14:53:49 +01:00
Timo Bejan	75127fd1bd	Pull request #92 : RedactionLog now stores ruleSetId Merge in RED/redaction-service from feature/ruleset-integration to master * commit '09069d11add65ae999ac80129d2188c64efaefec': RedactionLog now stores ruleSetId	2021-01-06 09:23:26 +01:00
Timo	09069d11ad	RedactionLog now stores ruleSetId	2021-01-06 10:11:16 +02:00
Timo Bejan	ad62a0666f	Pull request #91 : RuleSetId integration and drools update Merge in RED/redaction-service from feature/ruleset-integration to master * commit '5aba4b69bab772222bfd842afe52aae57c6ebba6': RuleSetId integration and drools update	2021-01-06 00:57:19 +01:00
Timo	5aba4b69ba	RuleSetId integration and drools update	2021-01-06 01:45:38 +02:00
Dominique Eiflaender	c2fd749fec	Pull request #90 : Fixed annotating cell with more than one TextBlock (Mismatch between EntityPositionSequence and found Entity) Merge in RED/redaction-service from AnnotateCellFix to master * commit 'e8256c49dc73c0ac93dff427bbeb3bcbfde5dd8b': Fixed annotating cell with more than one TextBlock (Mismatch between EntityPositionSequence and found Entity)	2021-01-05 15:03:37 +01:00
Dominique Eifländer	e8256c49dc	Fixed annotating cell with more than one TextBlock (Mismatch between EntityPositionSequence and found Entity)	2021-01-05 14:53:09 +01:00
Dominique Eiflaender	62351c8d16	Pull request #89 : Tables with only 2 column are treated as on text Merge in RED/redaction-service from 2columnTables to master * commit '599c7bd6e474b61c32f92d6c67e53a80de13a2e7': Tables with only 2 column are treated as on text	2021-01-05 12:35:05 +01:00
Dominique Eifländer	599c7bd6e4	Tables with only 2 column are treated as on text	2021-01-05 12:23:24 +01:00
Dominique Eiflaender	22f609a93a	Pull request #88 : Fixed false positive dictionary problems Merge in RED/redaction-service from FalsePositiveFix to master * commit '609018a051a41504328caf3bd44d27af5848959d': Fixed false positive dictionary problems	2021-01-04 16:51:10 +01:00
Dominique Eifländer	609018a051	Fixed false positive dictionary problems	2021-01-04 16:34:55 +01:00
Dominique Eiflaender	dedd169031	Pull request #87 : Find annotations also in Header cells Merge in RED/redaction-service from HeaderCellAnnotations to master * commit '704e6a4b5abad5c1e6f820e7b94c8a50b4c0dc6c': Find annotations also in Header cells	2021-01-04 12:09:49 +01:00
Dominique Eifländer	704e6a4b5a	Find annotations also in Header cells	2021-01-04 11:53:03 +01:00
Timo Bejan	eeda6fd207	Pull request #86 : fixed text-after and text-before spacing Merge in RED/redaction-service from text-after-before-fix to master * commit '0bc5abb29d0cf688201a37825bb0c726b2c7dcd2': fixed text-after and text-before spacing	2021-01-03 12:05:53 +01:00
Timo	0bc5abb29d	fixed text-after and text-before spacing	2021-01-03 12:40:21 +02:00
Dominique Eiflaender	53cb9718b6	Pull request #85 : Handle 'u00A0' character the same way as ' ' Merge in RED/redaction-service from specialSpaceCharacter to master * commit '79b57e85cd724ac040b5da9e33f90f4568aac7d0': Handle 'u00A0' character the same way as ' '	2020-12-23 11:07:44 +01:00
Dominique Eifländer	79b57e85cd	Handle 'u00A0' character the same way as ' '	2020-12-23 10:57:58 +01:00
Kresnadi Budisantoso	b173975ff5	Pull request #84 : Fixed 'Comparison method violates its general contract' by using QuickSort from PDFBox Merge in RED/redaction-service from sortAlgorithm to master * commit '000b145e710b8459e56223e77a9e19f4a7edd33e': Fixed 'Comparison method violates its general contract' by using QuickSort from PDFBox	2020-12-22 16:17:38 +01:00