RED-183: Fix catching validation errors

Fix style.
Pull request #11 : Feature/RED-161: replace hard-coded hint-type with dictionary-service query
2020-07-23 13:36:02 +02:00 · 2020-07-23 13:35:58 +02:00 · 2020-07-23 10:59:37 +02:00 · 2020-07-23 10:51:30 +02:00 · 2020-07-22 22:54:05 +02:00 · 2020-07-22 14:15:56 +02:00
9 changed files with 209 additions and 103 deletions
@@ -13,6 +13,7 @@ public class RedactionLogEntry {
    private String value;
    private String reason;
    private boolean redacted;
+    private boolean isHint;
    private String section;
    private float[] color;
    private List<Rectangle> positions = new ArrayList<>();
@@ -39,7 +39,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.6</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -4,6 +4,7 @@ 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;
@@ -22,6 +23,7 @@ import org.springframework.context.annotation.Import;
 import com.iqser.gin4.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})
@@ -33,24 +35,35 @@ public class Application {
    @Autowired
    private RulesClient rulesClient;

+
    public static void main(String[] args) {
+
        SpringApplication.run(Application.class, args);
    }

+
    @Bean
    public KieContainer kieContainer() {

-        KieServices kieServices = KieServices.Factory.get();
+        try {
+            KieServices kieServices = KieServices.Factory.get();

-        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        RulesResponse rules = rulesClient.getRules();
-        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();
+            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());
+            return kieServices.newKieContainer(kieModule.getReleaseId());
+        } catch (Exception e) {
+            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
+        }

    }

@@ -25,13 +25,17 @@ public class Section {

    private String headline;

+
    public boolean contains(String type) {
+
        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
    }

-    public void redact(String type, int ruleNumber, String reason){
+
+    public void redact(String type, int ruleNumber, String reason) {
+
        entities.forEach(entity -> {
-            if(entity.getType().equals(type)){
+            if (entity.getType().equals(type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -39,9 +43,11 @@ public class Section {
        });
    }

-    public void redactNot(String type, int ruleNumber, String reason){
+
+    public void redactNot(String type, int ruleNumber, String reason) {
+
        entities.forEach(entity -> {
-            if(entity.getType().equals(type)){
+            if (entity.getType().equals(type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -49,27 +55,19 @@ public class Section {
        });
    }

-    public void highlightAll(String type){
-        entities.forEach(entity -> {
-            if(entity.getType().equals(type)){
-                entity.setRedaction(true);
-            }
-        });
-    }

-
-    public void redactLineAfter(String start, String asType, int ruleNumber, String reason){
+    public void redactLineAfter(String start, String asType, int ruleNumber, String reason) {

        String value = StringUtils.substringBetween(text, start, "\n");

-        if(value != null){
-            Set<Entity> found  = findEntity(value.trim(), asType);
+        if (value != null) {
+            Set<Entity> found = findEntity(value.trim(), asType);
            entities.addAll(found);
        }

        // TODO No need to iterate
        entities.forEach(entity -> {
-            if(entity.getType().equals(asType)){
+            if (entity.getType().equals(asType)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -79,19 +77,18 @@ public class Section {
    }


-
-    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason){
+    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason) {

        String value = StringUtils.substringBetween(searchText, start, stop);

-        if(value != null){
-            Set<Entity> found  = findEntity(value.trim(), asType);
+        if (value != null) {
+            Set<Entity> found = findEntity(value.trim(), asType);
            entities.addAll(found);
        }

        // TODO No need to iterate
        entities.forEach(entity -> {
-            if(entity.getType().equals(asType)){
+            if (entity.getType().equals(asType)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -100,25 +97,21 @@ public class Section {
    }


-
-
    private Set<Entity> findEntity(String value, String asType) {

        Set<Entity> found = new HashSet<>();

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

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

        removeEntitiesContainedInLarger(found);

@@ -127,14 +120,18 @@ public class Section {


    private boolean isSeparator(char c) {
+
        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
    }

+
    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
+
        List<Entity> wordsToRemove = new ArrayList<>();
        for (Entity word : entities) {
            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord().length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
+                if (inner.getWord().length() < word.getWord()
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
                    wordsToRemove.add(inner);
                }
            }
@@ -1,6 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -32,6 +35,13 @@ public class DictionaryService {
    @Getter
    private Map<String, float[]> entryColors = new HashMap<>();

+    @Getter
+    private List<String> hintTypes = new ArrayList<>();
+
+    @Getter
+    private List<String> caseInsensitiveTypes = new ArrayList<>();
+
+
    public void updateDictionary() {

        long version = dictionaryClient.getVersion();
@@ -41,16 +51,34 @@ public class DictionaryService {
        }
    }

+
    private void updateDictionaryEntry() {
+
        try {
            TypeResponse typeResponse = dictionaryClient.getAllTypes();
-            if (typeResponse != null && !CollectionUtils.isEmpty(typeResponse.getTypes())) {
-                entryColors = typeResponse.getTypes().stream().collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
-                dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, s -> dictionaryClient.getDictionaryForType(s).getEntries().stream().collect(Collectors.toSet())));
+            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
+                entryColors = typeResponse.getTypes()
+                        .stream()
+                        .collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
+                dictionary = entryColors.keySet()
+                        .stream()
+                        .collect(Collectors.toMap(type -> type, s -> new HashSet<>(dictionaryClient.getDictionaryForType(s)
+                                .getEntries())));
+                hintTypes = typeResponse.getTypes()
+                        .stream()
+                        .filter(TypeResult::isHint)
+                        .map(TypeResult::getType)
+                        .collect(Collectors.toList());
+                caseInsensitiveTypes = typeResponse.getTypes()
+                        .stream()
+                        .filter(TypeResult::isCaseInsensitive)
+                        .map(TypeResult::getType)
+                        .collect(Collectors.toList());
            }
        } catch (FeignException e) {
            log.warn("Got some unknown feignException", e);
            throw e;
        }
    }
+
 }
@@ -68,7 +68,7 @@ public class DroolsExecutionService {
            KieModule kieModule = kieBuilder.getKieModule();
            kieContainer.updateToVersion(kieModule.getReleaseId());
        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules", e);
+            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
        }

    }
@@ -4,6 +4,7 @@ import java.awt.Color;
 import java.io.IOException;
 import java.util.List;

+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -36,8 +37,10 @@ import lombok.extern.slf4j.Slf4j;
@Service
@RequiredArgsConstructor
 public class AnnotationHighlightService {
+
    private final DictionaryService dictionaryService;

+
    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction) throws IOException {

        for (int page = 1; page <= document.getNumberOfPages(); page++) {
@@ -98,18 +101,29 @@ public class AnnotationHighlightService {
                            posXEnd = textPositions.getTextPositions().get(0).getYDirAdj() + 2;
                            posXInit = textPositions.getTextPositions().get(0).getYDirAdj() - height;
                            posYInit = textPositions.getTextPositions().get(0).getXDirAdj();
-                            posYEnd = textPositions.getTextPositions().get(textPositions.getTextPositions().size() - 1).getXDirAdj() - height + 4;
+                            posYEnd = textPositions.getTextPositions()
+                                    .get(textPositions.getTextPositions().size() - 1)
+                                    .getXDirAdj() - height + 4;
                        } else {

                            posXInit = textPositions.getTextPositions().get(0).getXDirAdj();
-                            posXEnd = textPositions.getTextPositions().get(textPositions.getTextPositions().size() - 1).getXDirAdj() + textPositions.getTextPositions().get(textPositions.getTextPositions().size() - 1).getWidth() + 1;
-                            posYInit = textPositions.getTextPositions().get(0).getPageHeight() - textPositions.getTextPositions().get(0).getYDirAdj() - 2;
-                            posYEnd = textPositions.getTextPositions().get(0).getPageHeight() - textPositions.getTextPositions().get(textPositions.getTextPositions().size() - 1).getYDirAdj() + 2;
+                            posXEnd = textPositions.getTextPositions()
+                                    .get(textPositions.getTextPositions().size() - 1)
+                                    .getXDirAdj() + textPositions.getTextPositions()
+                                    .get(textPositions.getTextPositions().size() - 1)
+                                    .getWidth() + 1;
+                            posYInit = textPositions.getTextPositions()
+                                    .get(0)
+                                    .getPageHeight() - textPositions.getTextPositions().get(0).getYDirAdj() - 2;
+                            posYEnd = textPositions.getTextPositions()
+                                    .get(0)
+                                    .getPageHeight() - textPositions.getTextPositions()
+                                    .get(textPositions.getTextPositions().size() - 1)
+                                    .getYDirAdj() + 2;
                        }

                        Rectangle textHighlightRectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);

-
                        List<PDAnnotation> annotations = pdPage.getAnnotations();
                        PDAnnotationTextMarkup highlight = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
                        highlight.constructAppearances();
@@ -121,10 +135,11 @@ public class AnnotationHighlightService {
                        annotationPosition.setUpperRightY(posYEnd + height);

                        highlight.setRectangle(annotationPosition);
-                        if (!flatRedaction) {
+                        if (!flatRedaction && !isHint(entity)) {
                            highlight.setAnnotationName(entityPositionSequence.getId().toString());
                            highlight.setTitlePopup(entityPositionSequence.getId().toString());
-                            highlight.setContents("\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\n" + "In Section : \"" + entity.getHeadline() + "\"");
+                            highlight.setContents("\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\n" + "In Section : \"" + entity
+                                    .getHeadline() + "\"");
                        }

                        highlight.setQuadPoints(toQuadPoints(textHighlightRectangle));
@@ -150,6 +165,7 @@ public class AnnotationHighlightService {
                redactionLogEntry.setType(entity.getType());
                redactionLogEntry.setRedacted(entity.isRedaction());
                redactionLogEntry.setSection(entity.getHeadline());
+                redactionLogEntry.setHint(isHint(entity));
                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
            }

@@ -161,37 +177,46 @@ public class AnnotationHighlightService {

        // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
        // of the area to be highlighted
-        return new float[]{
-                rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(),
-                rectangle.getTopLeft().getX() + rectangle.getWidth(), rectangle.getTopLeft().getY(),
-                rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY() + rectangle.getHeight(),
-                rectangle.getTopLeft().getX() + rectangle.getWidth(), rectangle.getTopLeft().getY() + rectangle.getHeight()};
+        return new float[]{rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getTopLeft()
+                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY(), rectangle.getTopLeft().getX(), rectangle.getTopLeft()
+                .getY() + rectangle.getHeight(), rectangle.getTopLeft()
+                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY() + rectangle.getHeight()};
    }


    private boolean isRedactionType(Entity entity) {
+
        if (!entity.isRedaction()) {
            return false;
        }
-        if(entity.getType().equalsIgnoreCase("VERTEBRATE") || entity.getType().equalsIgnoreCase("NO_REDACTION_INDICATOR") ){
-            // TODO in RED-161.
-            return true;
+        if (isHint(entity)) {
+            return false;
        }
-        return dictionaryService.getDictionary().keySet().contains(entity.getType());
+        return true;
    }

+
    private float[] getColor(Entity entity) {
-        if (!entity.isRedaction()) {
+
+        if (!entity.isRedaction() && !isHint(entity)) {
            return new float[]{0.627f, 0.627f, 0.627f};
        }

-        if(!dictionaryService.getEntryColors().containsKey(entity.getType())){
+        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
            return dictionaryService.getEntryColors().get("default");
        }

        return dictionaryService.getEntryColors().get(entity.getType());
    }

+    private boolean isHint(Entity entity) {
+        List<String> hintTypes = dictionaryService.getHintTypes();
+        if (CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType())) {
+            return true;
+        }
+        return false;
+    }
+
    private void visualizeTextBlock(TextBlock textBlock, PDPageContentStream contentStream) throws IOException {

        contentStream.setStrokingColor(Color.LIGHT_GRAY);
@@ -216,13 +241,15 @@ public class AnnotationHighlightService {


    private void visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
+
        for (List<Cell> row : table.getRows()) {
            for (Cell cell : row) {

                if (cell != null) {
                    contentStream.setLineWidth(0.5f);
                    contentStream.setStrokingColor(Color.CYAN);
-                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell.getHeight());
+                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
+                            .getHeight());
                    contentStream.stroke();

 //                    contentStream.setStrokingColor(Color.GREEN);
@@ -247,4 +274,5 @@ public class AnnotationHighlightService {
            contentStream.endText();
        }
    }
+
 }
@@ -52,11 +52,12 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
@SpringBootTest(webEnvironment = DEFINED_PORT)
 public class RedactionIntegrationTest {

-    public static final String VERTEBRATES_CODE = "vertebrate";
-    public static final String ADDRESS_CODE = "address";
-    public static final String NAME_CODE = "name";
-    public static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
-    public static final String DEFAULT = "default";
+    private static final String RULES = loadFromClassPath("drools/rules.drl");
+    private static final String VERTEBRATES_CODE = "vertebrate";
+    private static final String ADDRESS_CODE = "address";
+    private static final String NAME_CODE = "name";
+    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
+    private static final String DEFAULT = "default";

    @Autowired
    private RedactionController redactionController;
@@ -67,8 +68,8 @@ public class RedactionIntegrationTest {
    @MockBean
    private DictionaryClient dictionaryClient;

-    private Map<String, List<String>> dictionary = new HashMap<>();
-    private Map<String, float[]> typeColorMap = new HashMap<>();
+    private final Map<String, List<String>> dictionary = new HashMap<>();
+    private final Map<String, float[]> typeColorMap = new HashMap<>();

    @TestConfiguration
    public static class RedactionIntegrationTestConfiguration {
@@ -79,21 +80,23 @@ public class RedactionIntegrationTest {
            KieServices kieServices = KieServices.Factory.get();

            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            InputStream input = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
+            InputStream input = new ByteArrayInputStream(RULES.getBytes(StandardCharsets.UTF_8));
+            kieFileSystem.write("src/test/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
            kieBuilder.buildAll();
            KieModule kieModule = kieBuilder.getKieModule();

            return kieServices.newKieContainer(kieModule.getReleaseId());
        }
+
    }

+
    @Before
    public void stubRulesClient() {

        when(rulesClient.getVersion()).thenReturn(0L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(loadFromClassPath("drools/rules.drl")));
+        when(rulesClient.getRules()).thenReturn(new RulesResponse(RULES));

        loadDictionaryForTest();
        loadTypeForTest();
@@ -106,19 +109,41 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(DEFAULT)).thenReturn(getDictionaryResponse(DEFAULT));
    }

+
    private void loadDictionaryForTest() {
-        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/names.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/vertebrates.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/addresses.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(NO_REDACTION_INDICATOR, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/NoRedactionIndicator.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
+
+        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/names.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(NO_REDACTION_INDICATOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/NoRedactionIndicator.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
        dictionary.put(DEFAULT, new ArrayList<>());
    }

+
    private String cleanDictionaryEntry(String entry) {
+
        return TextNormalizationUtilities.removeHyphenLineBreaks(entry).replaceAll("\\n", " ");
    }

+
    private void loadTypeForTest() {
+
        typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
        typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
        typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
@@ -126,21 +151,31 @@ public class RedactionIntegrationTest {
        typeColorMap.put(DEFAULT, new float[]{1, 0.502f, 0});
    }

+
    private List<TypeResult> getTypeResponse() {
-        return typeColorMap.entrySet().stream().map(typeColor -> TypeResult.builder().type(typeColor.getKey()).color(typeColor.getValue()).build()).collect(Collectors.toList());
+
+        return typeColorMap.entrySet()
+                .stream()
+                .map(typeColor -> TypeResult.builder().type(typeColor.getKey()).color(typeColor.getValue()).build())
+                .collect(Collectors.toList());
    }

+
    private DictionaryResponse getDictionaryResponse(String type) {
+
        return DictionaryResponse.builder().color(typeColorMap.get(type)).entries(dictionary.get(type)).build();
    }

+
    @Test
    public void redactionTest() throws IOException {

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

-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
        request.setFlatRedaction(false);

        RedactionResult result = redactionController.redact(request);
@@ -154,12 +189,15 @@ public class RedactionIntegrationTest {
        System.out.println("numberOfPages: " + result.getNumberOfPages());
    }

+
    @Test
    public void classificationTest() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();

        RedactionResult result = redactionController.classify(request);

@@ -168,12 +206,15 @@ public class RedactionIntegrationTest {
        }
    }

+
    @Test
    public void sectionsTest() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();

        RedactionResult result = redactionController.sections(request);

@@ -182,12 +223,15 @@ public class RedactionIntegrationTest {
        }
    }

+
    @Test
    public void htmlTablesTest() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();

        RedactionResult result = redactionController.htmlTables(request);

@@ -196,12 +240,15 @@ public class RedactionIntegrationTest {
        }
    }

+
    @Test
    public void htmlTableRotationTest() throws IOException {

        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();

        RedactionResult result = redactionController.htmlTables(request);

@@ -210,10 +257,10 @@ public class RedactionIntegrationTest {
        }
    }

-    private String loadFromClassPath(String path) {

-        URL resource = ResourceLoader.class.getClassLoader()
-                .getResource(path);
+    private static String loadFromClassPath(String path) {
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
        if (resource == null) {
            throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
        }
@@ -221,12 +268,12 @@ public class RedactionIntegrationTest {
            StringBuilder sb = new StringBuilder();
            String str;
            while ((str = br.readLine()) != null) {
-                sb.append(str)
-                        .append("\n");
+                sb.append(str).append("\n");
            }
            return sb.toString();
        } catch (IOException e) {
            throw new IllegalArgumentException("could not load classpath resource: " + path, e);
        }
    }
-}
+
+}
@@ -4,14 +4,6 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Section

 global Section section

-rule "0: Highlight Indicators"
-	when
-		eval(section.getEntities().isEmpty()==false);
-	then
-		section.highlightAll("vertebrate");
-		section.highlightAll("no_redaction_indicator");
-	end
-

 rule "1: Redacted because Section contains Vertebrate"
 	when
Author	SHA1	Message	Date
Thierry Göckel	7dbe03483b	RED-183: Fix catching validation errors	2020-07-23 13:36:02 +02:00
Thierry Göckel	33ab09d7fc	Fix style.	2020-07-23 13:35:58 +02:00
Thierry Goeckel	9a425a8594	Pull request #11 : Feature/RED-161: replace hard-coded hint-type with dictionary-service query Merge in RED/redaction-service from feature/RED-161 to master * commit '3eb37fa6db0d9f1a4e6b93b2047b3b96c94cd9ff': RED-161: reverse caseSensitive RED-161: replace hard-coded hint-type with dictionary-service query	2020-07-23 10:59:37 +02:00
cheng	3eb37fa6db	RED-161: reverse caseSensitive	2020-07-23 10:51:30 +02:00
cheng	c8375a1ad9	RED-161: replace hard-coded hint-type with dictionary-service query	2020-07-22 22:54:05 +02:00
Dominique Eiflaender	94827a417f	Pull request #10 : Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false Merge in RED/redaction-service from RedactionLog1 to master * commit 'e7ea12a1b03f7f79e0f4fa12671f91ee326eef73': CodeStyle Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false	2020-07-22 14:15:56 +02:00
deiflaender	e7ea12a1b0	CodeStyle	2020-07-22 14:14:10 +02:00
deiflaender	6a9df397eb	Do not return redacted=true for vertebrates in RedactionLog, return isHint=true and redacted=false	2020-07-22 14:06:45 +02:00
Cheng Zhu	41c61dd214	Pull request #9 : DEV: Fixed Nullpointer on undefined color for type, adapted rule to Type naming. Merge in RED/redaction-service from Fix1 to master * commit '49fe418a60f424e373038b1f7b9d43ff4afde37c': DEV: Fixed Nullpointer on undefined color for type, adapted rule to Type naming.	2020-07-21 16:20:22 +02:00