RED-161: reverse caseSensitive

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

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

@@ -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<>();

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

@@ -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>

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

@@ -49,15 +49,6 @@ 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){
 
         String value = StringUtils.substringBetween(text, start, "\n");

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

@@ -1,6 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -32,6 +34,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 +50,36 @@ 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())));
+                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())));
+                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;
         }
     }
+
 }

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

@@ -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.isEmpty(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();
         }
     }
+
 }

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

@@ -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