Revert idRemoval fix, removed duplicate code

Pull request #98 : idRemoval fix
Merge in RED/redaction-service from annotation-fix to master * commit 'e3a960d0861bdfa96b90fe406eb825573007530e': idRemoval fix
2021-01-08 13:46:55 +01:00 · 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
22 changed files with 468 additions and 421 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();
        }
@@ -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<>();
+
+
+
+}
@@ -144,7 +144,7 @@ public class Section {
    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(text);
+        Matcher matcher = compiledPattern.matcher(searchText);

        while (matcher.find()) {
            String match = matcher.group(group);
@@ -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();
+    }
 }
@@ -12,6 +12,7 @@ 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;
@@ -45,15 +46,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()) {

@@ -65,7 +66,7 @@ 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);
@@ -89,15 +90,16 @@ 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<>();

@@ -119,7 +121,7 @@ public class EntityRedactionService {
        }

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

            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
@@ -262,8 +264,8 @@ public class EntityRedactionService {
        return new SectionSearchableTextPair(Section.builder()
                .isLocal(local)
                .dictionaryTypes(dictionary.getTypes())
-                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.get()) ? Stream
-                        .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber.get()).stream())
+                .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())
@@ -294,7 +296,6 @@ public class EntityRedactionService {
        }

        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
-
    }


@@ -29,15 +29,17 @@ public class EntitySearchUtils {

        for (String value : values) {

-            if (value.trim().length() <= 2) {
+            String cleanValue = value.trim();
+
+            if (cleanValue.length() <= 2) {
                continue;
            }

            int startIndex;
            int stopIndex = 0;
            do {
-                startIndex = inputString.indexOf(value, stopIndex);
-                stopIndex = startIndex + value.length();
+                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)))) {
@@ -70,7 +72,7 @@ public class EntitySearchUtils {
                    .sorted(Comparator.comparing(Entity::getStart))
                    .collect(Collectors.toList());
            Entity firstEntity = orderedEntities.get(0);
-            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord(), dictionary.isCaseInsensitiveDictionary(firstEntity
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
                    .getType()), firstEntity.getTargetSequences());

            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
@@ -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.
@@ -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());
@@ -390,6 +393,7 @@ public class RedactionIntegrationTest {
        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,26 +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;
@@ -39,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)
@@ -79,6 +78,8 @@ public class EntityRedactionServiceTest {
    @Autowired
    private DroolsExecutionService droolsExecutionService;

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

@@ -129,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
        }
@@ -162,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
        }
@@ -187,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()
@@ -212,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()
@@ -224,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)
@@ -288,27 +289,27 @@ 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)
@@ -329,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)
@@ -368,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
@@ -393,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);
@@ -419,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);
        }
@@ -464,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");
@@ -492,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);
    }


@@ -1,9 +1,9 @@
+configuration-service.url: "http://configuration-service-v1:8080"

 ribbon:
  ConnectTimeout: 600000
  ReadTimeout: 600000

-
 spring:
  main:
    allow-bean-definition-overriding: true
@@ -138,7 +138,7 @@ rule "12: Add recommendation for et al. author"
    when
        Section(searchText.contains("et al."))
    then
-		section.addRecommendationByRegEx("([^\\s(]*?( \\w\\.?)?) et al\\.?", false, 1, "CBI_author");
+		section.addRecommendationByRegEx("\\b([A-ZÄÖÜ][^\\s\\.,]+( [A-ZÄÖÜ]\\.?)?( [A-ZÄÖÜ]\\.?)?) et al\\.?", false, 1, "CBI_author");
    end

 // --------------------------------------- PII rules -------------------------------------------------------------------
Author	SHA1	Message	Date
Dominique Eifländer	d10c0a7900	Revert idRemoval fix, removed duplicate code	2021-01-08 13:46:55 +01:00
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