Fixed paragraph recognition

RED-692: Added matchedRule to RedactionLog
RED-632: Set status DECLINED in RedactionLog for manual removals that are DECLINED
2020-11-16 16:00:45 +01:00 · 2020-11-16 11:55:58 +01:00 · 2020-11-12 16:14:45 +01:00 · 2020-11-11 15:39:08 +01:00 · 2020-11-11 15:29:28 +01:00 · 2020-11-05 12:34:20 +01:00
29 changed files with 553 additions and 214 deletions
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment {
+
+    private String id;
+    private OffsetDateTime date;
+    private String text;
+    private String user;
+
+}
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IdRemoval {
+
+    private String id;
+    private String user;
+    private Status status;
+    private boolean removeFromDictionary;
+
+}
@@ -4,18 +4,25 @@ import java.util.ArrayList;
 import java.util.List;

 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
+@Builder
@AllArgsConstructor
@NoArgsConstructor
 public class ManualRedactionEntry {

+    private String id;
+    private String user;
    private String type;
    private String value;
    private String reason;
+    private String legalBasis;
    private List<Rectangle> positions = new ArrayList<>();
+    private Status status;
+    private boolean addToDictionary;

    private String section;
    private int sectionNumber;
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ManualRedactionType {
+    ADD, REMOVE
+}
@@ -1,17 +1,29 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;

 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
+@Builder
@AllArgsConstructor
@NoArgsConstructor
 public class ManualRedactions {

-    private Set<String> idsToRemove = new HashSet<>();
+    @Builder.Default
+    private Set<IdRemoval> idsToRemove = new HashSet<>();
+
+    @Builder.Default
    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
+
+    @Builder.Default
+    private Map<String, List<Comment>> comments = new HashMap<>();
+
 }
@@ -18,6 +18,8 @@ public class RedactionLogEntry {
    private String type;
    private String value;
    private String reason;
+    private int matchedRule;
+    private String legalBasis;
    private boolean redacted;
    private boolean isHint;
    private String section;
@@ -27,5 +29,7 @@ public class RedactionLogEntry {
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
    private boolean manual;
+    private Status status;
+    private ManualRedactionType manualRedactionType;

 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}
@@ -20,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.0.12</version>
+            <version>1.2.0</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -12,6 +12,7 @@ import org.kie.api.builder.KieModule;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -29,7 +30,7 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin
@Import({DefaultWebMvcConfiguration.class})
@EnableFeignClients(basePackageClasses = RulesClient.class)
@EnableConfigurationProperties(RedactionServiceSettings.class)
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, WebMvcMetricsAutoConfiguration.class})
 public class Application {

    @Autowired
@@ -131,7 +131,7 @@ public class TextBlock extends AbstractTextContainer {
        TextPositionSequence previous = null;
        for (TextPositionSequence word : sequences) {
            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -101,6 +101,9 @@ public class TextPositionSequence implements CharSequence {
        }
    }

+    public float getRotationAdjustedY() {
+        return textPositions.get(0).getY();
+    }

    public float getY1() {

@@ -4,36 +4,33 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

-import lombok.RequiredArgsConstructor;
 import lombok.Value;

@Value
-@RequiredArgsConstructor
 public class CellValue {

    TextBlock textBlock;

    int rowSpanStart;

+
    @Override
    public String toString() {

        StringBuilder sb = new StringBuilder();

-
-            TextPositionSequence previous = null;
-            for (TextPositionSequence word : textBlock.getSequences()) {
-
-                if (previous != null) {
-                    if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
-                        sb.append('\n');
-                    } else {
-                        sb.append(' ');
-                    }
+        TextPositionSequence previous = null;
+        for (TextPositionSequence word : textBlock.getSequences()) {
+            if (previous != null) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                    sb.append('\n');
+                } else {
+                    sb.append(' ');
                }
-                sb.append(word.toString());
-                previous = word;
            }
+            sb.append(word.toString());
+            previous = word;
+        }

        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
                .replaceAll("\n", " ")
@@ -17,6 +17,7 @@ public class Entity {
    private final String type;
    private boolean redaction;
    private String redactionReason;
+    private String legalBasis;
    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
    private List<TextPositionSequence> targetSequences;
    private Integer start;
@@ -30,7 +31,7 @@ public class Entity {
    private int sectionNumber;


-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber) {
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis) {

        this.word = word;
        this.type = type;
@@ -40,6 +41,7 @@ public class Entity {
        this.headline = headline;
        this.matchedRule = matchedRule;
        this.sectionNumber = sectionNumber;
+        this.legalBasis = legalBasis;
    }


@@ -179,7 +179,7 @@ public class SearchableText {
        for (TextPositionSequence word : sequences) {

            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -203,7 +203,7 @@ public class SearchableText {
        for (TextPositionSequence word : sequences) {

            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -56,13 +56,14 @@ public class Section {
    }


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

        entities.forEach(entity -> {
            if (entity.getType().equals(type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
            }
        });
    }
@@ -80,19 +81,20 @@ public class Section {
    }


-    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason) {
+    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {

        entities.forEach(entity -> {
            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
            }
        });
    }


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

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -111,13 +113,14 @@ public class Section {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
            }
        });

    }


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

        String[] values = StringUtils.substringsBetween(searchText, start, stop);

@@ -136,6 +139,7 @@ public class Section {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
            }
        });
    }
@@ -151,10 +155,15 @@ public class Section {
            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, sectionNumber));
+            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(searchText.charAt(startIndex - 1)) || isSeparator(
+                    searchText.charAt(startIndex - 1))) && (stopIndex == searchText.length() || isSeparator(searchText.charAt(
+                    stopIndex)))) {
+                found.add(new Entity(searchText.substring(startIndex, stopIndex),
+                                     asType,
+                                     startIndex,
+                                     stopIndex,
+                                     headline,
+                                     sectionNumber));
            }
        } while (startIndex > -1);

@@ -164,7 +173,8 @@ public class Section {

    private boolean isSeparator(char c) {

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


@@ -186,23 +196,23 @@ public class Section {

    public void highlightCell(String cellHeader, int ruleNumber, String type) {

-        annotateCell(cellHeader, ruleNumber, type, false, null);
+        annotateCell(cellHeader, ruleNumber, type, false, null, null);
    }


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

-        annotateCell(cellHeader, ruleNumber, type, true, reason);
+        annotateCell(cellHeader, ruleNumber, type, true, reason, legalBasis);
    }


    public void redactNotCell(String cellHeader, int ruleNumber, String type, String reason) {

-        annotateCell(cellHeader, ruleNumber, type, false, reason);
+        annotateCell(cellHeader, ruleNumber, type, false, reason, null);
    }


-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, String reason) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, String reason, String legalBasis) {

        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

@@ -210,19 +220,22 @@ public class Section {
        if (value == null) {
            log.warn("Could not find any data for {}.", cellHeader);
        } else {
-            Entity entity = new Entity(value.toString(), type, value.getRowSpanStart(),
-                    value.getRowSpanStart() + value.toString()
-                    .length(), headline, sectionNumber);
+            String word = value.toString();
+            Entity entity = new Entity(word,
+                                       type,
+                                       value.getRowSpanStart(),
+                                       value.getRowSpanStart() + word.length(),
+                                       headline,
+                                       sectionNumber);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
            entity.setTargetSequences(value.getTextBlock()
-                    .getSequences()); // Make sure no other cells with same content are highlighted
+                                              .getSequences()); // Make sure no other cells with same content are highlighted
+            entity.setLegalBasis(legalBasis);

            // HashSet keeps the older value, but we want the new only.
-            if (entities.contains(entity)) {
-                entities.remove(entity);
-            }
+            entities.remove(entity);
            entities.add(entity);

            entities = removeEntitiesContainedInLarger(entities);
@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,6 +12,7 @@ import java.util.stream.Collectors;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;

+import com.iqser.red.service.configuration.v1.api.model.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;
@@ -20,9 +22,9 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
-@Slf4j
 public class DictionaryService {

    private final DictionaryClient dictionaryClient;
@@ -45,6 +47,15 @@ public class DictionaryService {
    @Getter
    private float[] defaultColor;

+    @Getter
+    private float[] requestAddColor;
+
+    @Getter
+    private float[] requestRemoveColor;
+
+    @Getter
+    private float[] notRedactedColor;
+

    public void updateDictionary() {

@@ -63,7 +74,7 @@ public class DictionaryService {
            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
                entryColors = typeResponse.getTypes()
                        .stream()
-                        .collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
+                        .collect(Collectors.toMap(TypeResult::getType, t -> convertColor(t.getHexColor())));
                hintTypes = typeResponse.getTypes()
                        .stream()
                        .filter(TypeResult::isHint)
@@ -74,8 +85,16 @@ public class DictionaryService {
                        .filter(TypeResult::isCaseInsensitive)
                        .map(TypeResult::getType)
                        .collect(Collectors.toList());
-                dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, this::convertEntries));
-                defaultColor = dictionaryClient.getDefaultColor().getColor();
+                dictionary = entryColors.keySet()
+                        .stream()
+                        .collect(Collectors.toMap(type -> type, this::convertEntries));
+
+
+                Colors colors = dictionaryClient.getColors();
+                defaultColor = convertColor(colors.getDefaultColor());
+                requestAddColor = convertColor(colors.getRequestAdd());
+                requestRemoveColor = convertColor(colors.getRequestRemove());
+                notRedactedColor = convertColor(colors.getNotRedacted());
            }
        } catch (FeignException e) {
            log.warn("Got some unknown feignException", e);
@@ -85,6 +104,7 @@ public class DictionaryService {


    private Set<String> convertEntries(String s) {
+
        if (caseInsensitiveTypes.contains(s)) {
            return dictionaryClient.getDictionaryForType(s)
                    .getEntries()
@@ -95,4 +115,11 @@ public class DictionaryService {
        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
    }

+
+    private float[] convertColor(String hex) {
+
+        Color color = Color.decode(hex);
+        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
+    }
+
 }
@@ -70,7 +70,7 @@ public class EntityRedactionService {
                                    .replaceAll("-", "");
                            tabularData.put(headerName, new CellValue(cell.getTextBlocks().get(0), cellStart));
                        });
-                        start = start + cell.toString().length();
+                        start = start + cell.toString().length() + 1; // include automatically appended white space
                        for (TextBlock textBlock : cell.getTextBlocks()) {
                            searchableRow.addAll(textBlock.getSequences());
                        }
@@ -117,7 +117,7 @@ public class EntityRedactionService {
                classifiedDoc.getEntities()
                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber()));
+                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity.getLegalBasis()));
            }
        }

@@ -143,17 +143,17 @@ public class EntityRedactionService {
    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber) {

        Set<Entity> found = new HashSet<>();
-        if (StringUtils.isEmpty(searchableText.toString())) {
+        String searchableString = searchableText.toString();
+        if (StringUtils.isEmpty(searchableString)) {
            return found;
        }

-        String inputString = searchableText.toString();
-        String lowercaseInputString = inputString.toLowerCase();
+        String lowercaseInputString = searchableString.toLowerCase();
        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionary().entrySet()) {
            if (dictionaryService.getCaseInsensitiveTypes().contains(entry.getKey())) {
                found.addAll(find(lowercaseInputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
            } else {
-                found.addAll(find(inputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+                found.addAll(find(searchableString, entry.getValue(), entry.getKey(), headline, sectionNumber));
            }
        }

@@ -5,7 +5,6 @@ import java.util.List;

 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;

 import lombok.experimental.UtilityClass;
@@ -19,14 +18,9 @@ public class IdBuilder {

        StringBuilder sb = new StringBuilder();
        crossSequenceParts.forEach(sequencePart -> sequencePart.getTextPositions().forEach(textPosition -> {
-            sb.append(textPosition.getTextMatrix());
+            sb.append(textPosition.getTextMatrix()).append(sequencePart.getPage());
        }));

        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
    }
-
-
-    public String buildId(ManualRedactionEntry manualRedactionEntry) {
-        return hashFunction.hashString(manualRedactionEntry.toString(), StandardCharsets.UTF_8).toString();
-    }
 }
@@ -39,7 +39,7 @@ public class SectionsBuilderService {

                current.setPage(page.getPageNumber());

-                if (prev != null && current.getClassification().startsWith("H ") || !document.isHeadlines()) {
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                    chunkBlock.setHeadline(lastHeadline);
                    if(document.isHeadlines()) {
@@ -41,14 +41,11 @@ public class Cell extends Rectangle {

        StringBuilder sb = new StringBuilder();

-        TextPositionSequence previous = null;
        for (TextBlock textBlock : textBlocks) {
-
-
+            TextPositionSequence previous = null;
            for (TextPositionSequence word : textBlock.getSequences()) {
-
                if (previous != null) {
-                    if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                        sb.append('\n');
                    } else {
                        sb.append(' ');
@@ -64,5 +61,4 @@ public class Cell extends Rectangle {
                .replaceAll(" {2}", " ");
    }

-}
-
+}
@@ -3,6 +3,7 @@ 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;
@@ -17,14 +18,19 @@ 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.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
@@ -32,7 +38,6 @@ import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSeque
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -90,39 +95,82 @@ public class AnnotationHighlightService {

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

+        // Duplicates can exist due table extraction colums over multiple rows.
+        Set<String> processedIds = new HashSet<>();
+
+        entityLoop:
        for (Entity entity : classifiedDoc.getEntities().get(page)) {

            if (flatRedaction && !isRedactionType(entity)) {
                continue;
            }

-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
+
+            boolean requestedToRemove = false;
+            List<Comment> comments = null;

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

-                if (manualRedactions != null && manualRedactions.getIdsToRemove()
-                        .contains(entityPositionSequence.getId())) {
-                    String manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
-                    entity.setRedaction(false);
-                    entity.setRedactionReason(manualOverrideReason);
-                    redactionLogEntry.setRedacted(false);
-                    redactionLogEntry.setReason(manualOverrideReason);
-                    redactionLogEntry.setManual(true);
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity);
+                if (processedIds.contains(entityPositionSequence.getId())) {
+
+                    // TODO refactor this outer loop jump as soon as we have the time.
+                    continue entityLoop;
+                } else {
+                    processedIds.add(entityPositionSequence.getId());
+                }
+
+                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
+                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
+                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
+                            comments = manualRedactions.getComments().get(manualRemoval.getId());
+                            String manualOverrideReason = null;
+                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
+                                entity.setRedaction(false);
+                                redactionLogEntry.setRedacted(false);
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
+                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                                requestedToRemove = true;
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
+                        }
+                    }
+
                }

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
-                    List<Rectangle> rectanglesPerline = getRectanglesPerLine(entityPositionSequence.getSequences()
+                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
                            .stream()
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

-                    redactionLogEntry.getPositions().addAll(rectanglesPerline);
-                    annotations.add(createAnnotation(rectanglesPerline, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity), !flatRedaction && !isHint(entity)));
+                    if (manualRedactions != null) {
+                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
+                    }
+
+                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);
+
+                    annotations.addAll(createAnnotation(rectanglesPerLine, entityPositionSequence.getId(), createAnnotationContent(entity), getColor(entity, requestedToRemove), comments, !isHint(entity)));
                }

                redactionLogEntry.setId(entityPositionSequence.getId());
+
+                // FIXME ids should never be null. Figure out why this happens.
+                if (redactionLogEntry.getId() != null) {
+                    classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+                }
            }
-            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+
+
        }

    }
@@ -164,38 +212,40 @@ public class AnnotationHighlightService {

        for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {

-            String id = IdBuilder.buildId(manualRedactionEntry);
+            String id = manualRedactionEntry.getId();

            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id);

-            boolean foundOnPage = false;
+            List<Rectangle> rectanglesOnPage = new ArrayList<>();
            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-
-                if (page != rectangle.getPage()) {
-                    continue;
+                if (page == rectangle.getPage()) {
+                    rectanglesOnPage.add(rectangle);
+                    redactionLogEntry.getPositions().add(rectangle);
                }
-
-                foundOnPage = true;
-
-                PDAnnotationTextMarkup highlight = createAnnotation(List.of(rectangle), id, createAnnotationContent(manualRedactionEntry), getColor(manualRedactionEntry
-                        .getType()), true);
-                annotations.add(highlight);
-
-                redactionLogEntry.getPositions().add(rectangle);
            }
-            if (foundOnPage) {
+
+            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                annotations.addAll(createAnnotation(rectanglesOnPage, id, createAnnotationContent(manualRedactionEntry), getColorForManualAdd(manualRedactionEntry
+                        .getType(), manualRedactionEntry.getStatus()), manualRedactions.getComments().get(id), true));
                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
            }
        }
    }


+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
+    }
+
+
    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id) {

        return RedactionLogEntry.builder()
                .id(id)
                .color(getColor(manualRedactionEntry.getType()))
                .reason(manualRedactionEntry.getReason())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
                .value(manualRedactionEntry.getValue())
                .type(manualRedactionEntry.getType())
                .redacted(true)
@@ -203,6 +253,8 @@ public class AnnotationHighlightService {
                .section(manualRedactionEntry.getSection())
                .sectionNumber(manualRedactionEntry.getSectionNumber())
                .manual(true)
+                .status(manualRedactionEntry.getStatus())
+                .manualRedactionType(ManualRedactionType.ADD)
                .build();
    }

@@ -210,55 +262,96 @@ public class AnnotationHighlightService {
    private RedactionLogEntry createRedactionLogEntry(Entity entity) {

        return RedactionLogEntry.builder()
-                .color(getColor(entity))
+                .color(getColor(entity, false))
                .reason(entity.getRedactionReason())
+                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
                .isHint(isHint(entity))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
+                .matchedRule(entity.getMatchedRule())
                .build();
    }


-    private PDAnnotationTextMarkup createAnnotation(List<Rectangle> rectangles, String id, String content,
-                                                    float[] color, boolean popup) {
+    private List<PDAnnotation> createAnnotation(List<Rectangle> rectangles, String id, String content, float[] color,
+                                                List<Comment> comments, boolean popup) {
+
+        List<PDAnnotation> annotations = new ArrayList<>();

        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
        annotation.constructAppearances();
-        annotation.setRectangle(toPDRectangle(rectangles.get(0)));
+        PDRectangle pdRectangle = toPDRectangle(rectangles);
+        annotation.setRectangle(pdRectangle);
        annotation.setQuadPoints(toQuadPoints(rectangles));
        if (popup) {
-            annotation.setAnnotationName(id);
-            annotation.setTitlePopup(id);
            annotation.setContents(content);
        }
+        annotation.setTitlePopup(id);
+        annotation.setAnnotationName(id);
        annotation.setColor(new PDColor(color, PDDeviceRGB.INSTANCE));
-        return annotation;
+        annotations.add(annotation);
+
+        if (comments != null) {
+            for (Comment comment : comments) {
+                PDAnnotationText txtAnnot = new PDAnnotationText();
+                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
+                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
+                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
+                txtAnnot.setTitlePopup(comment.getUser());
+                txtAnnot.setContents(comment.getText());
+                txtAnnot.setRectangle(pdRectangle);
+                annotations.add(txtAnnot);
+            }
+        }
+
+        return annotations;
    }


    private String createAnnotationContent(Entity entity) {

-        return "\nRule " + entity.getMatchedRule() + " matched" + "\n\n" + entity.getRedactionReason() + "\n\nIn " + "Section : \"" + entity
-                .getHeadline() + "\"";
+        return "\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\nLegal basis:" + entity
+                .getLegalBasis() + "\n\nIn section: \"" + entity.getHeadline() + "\"";
    }


    private String createAnnotationContent(ManualRedactionEntry entry) {

-        return "\nManual Redaction" + "\n\nIn Section : \"" + entry.getSection() + "\"";
+        return "\nManual Redaction\n\nIn Section : \"" + entry.getSection() + "\"";
    }


-    private PDRectangle toPDRectangle(Rectangle rectangle) {
+    private PDRectangle toPDRectangle(List<Rectangle> rectangles) {
+
+        float lowerLeftX = Float.MAX_VALUE;
+        float upperRightX = 0;
+        float lowerLeftY = 0;
+        float upperRightY = Float.MAX_VALUE;
+
+        for (Rectangle rectangle : rectangles) {
+            if (rectangle.getTopLeft().getX() < lowerLeftX) {
+                lowerLeftX = rectangle.getTopLeft().getX();
+            }
+            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
+                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
+            }
+            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
+                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
+            }
+            if (rectangle.getTopLeft().getY() < upperRightY) {
+                upperRightY = rectangle.getTopLeft().getY();
+            }
+        }

        PDRectangle annotationPosition = new PDRectangle();
-        annotationPosition.setLowerLeftX(rectangle.getTopLeft().getX());
-        annotationPosition.setLowerLeftY(rectangle.getTopLeft().getY() + rectangle.getHeight());
-        annotationPosition.setUpperRightX(rectangle.getTopLeft().getX() + rectangle.getWidth());
-        annotationPosition.setUpperRightY(rectangle.getTopLeft().getY());
+        annotationPosition.setLowerLeftX(lowerLeftX);
+        annotationPosition.setLowerLeftY(lowerLeftY);
+        annotationPosition.setUpperRightX(upperRightX);
+        annotationPosition.setUpperRightY(upperRightY);
        return annotationPosition;
    }

@@ -299,10 +392,13 @@ public class AnnotationHighlightService {
    }


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

+        if (requestedToRemove) {
+            return dictionaryService.getRequestRemoveColor();
+        }
        if (!entity.isRedaction() && !isHint(entity)) {
-            return new float[]{0.627f, 0.627f, 0.627f};
+            return dictionaryService.getNotRedactedColor();
        }
        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
            return dictionaryService.getDefaultColor();
@@ -311,6 +407,17 @@ public class AnnotationHighlightService {
    }


+    private float[] getColorForManualAdd(String type, Status status) {
+
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor();
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor();
+        }
+        return getColor(type);
+    }
+
+
    private float[] getColor(String type) {

        if (!dictionaryService.getEntryColors().containsKey(type)) {
@@ -400,4 +507,4 @@ public class AnnotationHighlightService {
        }
    }

-}
+}
@@ -12,5 +12,6 @@ management:
  endpoint:
    metrics.enabled: ${monitoring.enabled:false}
    prometheus.enabled: ${monitoring.enabled:false}
+    health.enabled: true
  endpoints.web.exposure.include: prometheus, health
  metrics.export.prometheus.enabled: ${monitoring.enabled:false}
@@ -2,10 +2,6 @@ spring:
  application:
    name: redaction-service-v1

-
-management:
-  endpoints:
-    web:
-      base-path: /
-      path-mapping:
-        health: "health"
+management.endpoints:
+  web.base-path: /
+  enabled-by-default: false
@@ -14,11 +14,13 @@ 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;
@@ -38,17 +40,21 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
+import com.iqser.red.service.configuration.v1.api.model.Colors;
 import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
 import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
 import com.iqser.red.service.configuration.v1.api.model.TypeResult;
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
 import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.model.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.Point;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
@@ -79,9 +85,10 @@ public class RedactionIntegrationTest {
    private DictionaryClient dictionaryClient;

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

    @TestConfiguration
    public static class RedactionIntegrationTestConfiguration {
@@ -123,7 +130,7 @@ public class RedactionIntegrationTest {
        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
        when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
        when(dictionaryClient.getDictionaryForType(MUST_REDACT)).thenReturn(getDictionaryResponse(MUST_REDACT));
-        when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor(new float[]{1f, 0.502f, 0f}));
+        when(dictionaryClient.getColors()).thenReturn(colors);
    }


@@ -180,14 +187,14 @@ public class RedactionIntegrationTest {

    private void loadTypeForTest() {

-        typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
-        typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
-        typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
-        typeColorMap.put(SPONSOR, new float[]{.5f, .5f, .5f});
-        typeColorMap.put(NO_REDACTION_INDICATOR, new float[]{0.8f, 0, 0.8f});
-        typeColorMap.put(REDACTION_INDICATOR, new float[]{1, 0.502f, 0.1f});
-        typeColorMap.put(HINT_ONLY, new float[]{0.8f, 1, 0.8f});
-        typeColorMap.put(MUST_REDACT, new float[]{1, 0, 0});
+        typeColorMap.put(VERTEBRATES_CODE, "#00ff00");
+        typeColorMap.put(ADDRESS_CODE, "#00ffff");
+        typeColorMap.put(NAME_CODE, "#ffff00");
+        typeColorMap.put(SPONSOR, "#2c21fc");
+        typeColorMap.put(NO_REDACTION_INDICATOR, "#e600ff");
+        typeColorMap.put(REDACTION_INDICATOR, "#ff7700");
+        typeColorMap.put(HINT_ONLY, "#00fcb1");
+        typeColorMap.put(MUST_REDACT, "#ff0000");

        hintTypeMap.put(VERTEBRATES_CODE, true);
        hintTypeMap.put(ADDRESS_CODE, false);
@@ -206,6 +213,11 @@ public class RedactionIntegrationTest {
        caseInSensitiveMap.put(REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(HINT_ONLY, true);
        caseInSensitiveMap.put(MUST_REDACT, true);
+
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
    }


@@ -215,7 +227,7 @@ public class RedactionIntegrationTest {
                .stream()
                .map(typeColor -> TypeResult.builder()
                        .type(typeColor.getKey())
-                        .color(typeColor.getValue())
+                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
                        .build())
@@ -227,7 +239,7 @@ public class RedactionIntegrationTest {
    private DictionaryResponse getDictionaryResponse(String type) {

        return DictionaryResponse.builder()
-                .color(typeColorMap.get(type))
+                .hexColor(typeColorMap.get(type))
                .entries(dictionary.get(type))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
@@ -251,7 +263,16 @@ public class RedactionIntegrationTest {
                    .document(IOUtils.toByteArray(new FileInputStream(path)))
                    .build();
            System.out.println("Redacting file : " + path.getName());
-            redactionController.redact(request);
+            RedactionResult result = redactionController.redact(request);
+
+            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();
+            result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+                duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
+            });
+
+            duplicates.entrySet().forEach(entry -> {
+                assertThat(entry.getValue().size()).isEqualTo(1);
+            });
        }

    }
@@ -280,7 +301,7 @@ public class RedactionIntegrationTest {

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

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -330,9 +351,26 @@ public class RedactionIntegrationTest {
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");

        ManualRedactions manualRedactions = new ManualRedactions();
-        manualRedactions.setIdsToRemove(Set.of("0836727c3508a0b2ea271da69c04cc2f"));
+
+        String manualAddId = UUID.randomUUID().toString();
+
+        Comment comment = Comment.builder()
+                .date(OffsetDateTime.now())
+                .user("TEST_USER")
+                .text("This is a comment test")
+                .build();
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .id("0836727c3508a0b2ea271da69c04cc2f")
+                .status(Status.REQUESTED)
+                .build()));
+
+        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
+        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
+        manualRedactions.getComments().put(manualAddId, List.of(comment));

        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
+        manualRedactionEntry.setId(manualAddId);
+        manualRedactionEntry.setStatus(Status.REQUESTED);
        manualRedactionEntry.setType("name");
        manualRedactionEntry.setValue("O'Loughlin C.K.");
        manualRedactionEntry.setReason("Manual Redaction");
@@ -361,8 +399,7 @@ public class RedactionIntegrationTest {
    public void classificationTest() throws IOException {

        System.out.println("classificationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -380,8 +417,7 @@ public class RedactionIntegrationTest {
    public void sectionsTest() throws IOException {

        System.out.println("sectionsTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " + "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -399,7 +435,7 @@ public class RedactionIntegrationTest {
    public void htmlTablesTest() throws IOException {

        System.out.println("htmlTablesTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/line_breaks.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -417,8 +453,7 @@ public class RedactionIntegrationTest {
    public void htmlTableRotationTest() throws IOException {

        System.out.println("htmlTableRotationTest");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S" +
-                "-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -481,8 +516,7 @@ public class RedactionIntegrationTest {
        if (resource == null) {
            throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
        }
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(),
-                StandardCharsets.UTF_8))) {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
            StringBuilder sb = new StringBuilder();
            String str;
            while ((str = br.readLine()) != null) {
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
+import com.iqser.red.service.configuration.v1.api.model.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;
@@ -55,9 +55,11 @@ public class EntityRedactionServiceTest {
    private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
    private static final String NAME_CODE = "name";
    private static final String ADDRESS_CODE = "address";
+    private static final String SPONSOR_CODE = "sponsor";

    private static final AtomicLong DICTIONARY_VERSION = new AtomicLong();
    private static final AtomicLong RULES_VERSION = new AtomicLong();
+
    @MockBean
    private DictionaryClient dictionaryClient;

@@ -134,7 +136,35 @@ public class EntityRedactionServiceTest {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            entityRedactionService.processDocument(classifiedDoc, null);
            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
-            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 names, 1 address, 1 Y and 2 N entities
+            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+        }
+    }
+
+
+    @Test
+    public void testNestedRedaction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/nested_redaction.pdf");
+
+        RedactionRequest redactionRequest = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
+                .build();
+        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, 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
        }
    }

@@ -210,21 +240,32 @@ public class EntityRedactionServiceTest {
                "   when\n" +
                "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
                "   then\n" +
-                "       section.redactLineAfter(\"Name:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Phone:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Fax:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Tel.:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Tel:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"E-mail:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Email:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Contact:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Fax number:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactLineAfter(\"Telephone:\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6, \"Applicant information was found\");\n" +
-                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6, \"Applicant information was found\");\n" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Phone:\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax number:\", \"address\", 6, \"Applicant information was found\"," +
+                " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6, \"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));
@@ -252,6 +293,39 @@ public class EntityRedactionServiceTest {
    }


+    @Test
+    public void testSponsorInCell() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" + "rule \"11: Redact sponsor company\"\n" + "    when\n" + "        " +
+                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
+                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
+                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
+        when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules();
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
+        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/sponsor_companies.txt")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(dictionaryResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 11)
+                    .count()).isEqualTo(1);
+        }
+
+    }
+
+
    @Test
    public void headerPropagation() throws IOException {

@@ -273,7 +347,7 @@ public class EntityRedactionServiceTest {
            entityRedactionService.processDocument(classifiedDoc, null);
            assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
-            assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(4);
+            assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
        }

        pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation2.pdf");
@@ -335,7 +409,7 @@ public class EntityRedactionServiceTest {
                "    when\n" +
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
                "    then\n" +
-                "        section.redactNot(\"name\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
                "    end\n" +
@@ -344,20 +418,40 @@ public class EntityRedactionServiceTest {
                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
                "\"Yes\"))\n" +
                "    then\n" +
-                "        section.redact(\"name\", 9, \"Redacted because row is a vertebrate study\");\n" +
-                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\");\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
+                " 1107/2009 Art. 63 (2g)\");\n" +
                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
                "    end";
        when(rulesClient.getVersion()).thenReturn(RULES_VERSION.incrementAndGet());
        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
        TypeResponse typeResponse = TypeResponse.builder()
                .types(Arrays.asList(
-                        TypeResult.builder().type(NAME_CODE).color(new float[]{1, 1, 0}).build(),
-                        TypeResult.builder().type(ADDRESS_CODE).color(new float[]{0, 1, 1}).build()))
+                        TypeResult.builder().type(NAME_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().type(SPONSOR_CODE).hexColor("#00ffff").build()))
                .build();
        when(dictionaryClient.getVersion()).thenReturn(DICTIONARY_VERSION.incrementAndGet());
        when(dictionaryClient.getAllTypes()).thenReturn(typeResponse);
-        when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor());
+
+        // Default empty return to prevent NPEs
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE)).thenReturn(sponsorResponse);
+
+        Colors colors = new Colors();
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
+
+        when(dictionaryClient.getColors()).thenReturn(colors);
    }


@@ -9,14 +9,14 @@ rule "1: Redacted because Section contains Vertebrate"
 	when
 		Section(matchesType("vertebrate"))
 	then
-		section.redact("name", 1, "Redacted because Section contains Vertebrate");
-		section.redact("address", 1, "Redacted because Section contains Vertebrate");
+		section.redact("name", 1, "Redacted because Section contains Vertebrate", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 1, "Redacted because Section contains Vertebrate", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


 rule "2: Not Redacted because Section contains no Vertebrate"
 	when
-		Section(matchesType("vertebrate"))
+		Section(!matchesType("vertebrate"))
 	then
 		section.redactNot("name", 2, "Not Redacted because Section contains no Vertebrate");
 		section.redactNot("address", 2, "Not Redacted because Section contains no Vertebrate");
@@ -36,8 +36,8 @@ rule "4: Redact Names and Addresses if no_redaction_indicator and redaction_indi
 	when
 		Section(matchesType("vertebrate"), matchesType("no_redaction_indicator"), matchesType("redaction_indicator"))
 	then
-		section.redact("name", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
-		section.redact("address", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator");
+		section.redact("name", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 4, "Vertebrate was found and no_redaction_indicator and redaction_indicator", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


@@ -54,26 +54,26 @@ rule "6: Redact contact information if applicant is found"
 	when
 		Section(headlineContainsWord("applicant") || text.contains("Applicant") || headlineContainsWord("Primary contact") || headlineContainsWord("Alternative contact"))
 	then
-		section.redactLineAfter("Name:", "address", 6, "Applicant information was found");
-		section.redactBetween("Address:", "Contact", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Contact point:",  "address", 6, "Applicant information was found");
-		section.redactLineAfter("Phone:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Fax:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Tel.:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Tel:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("E-mail:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Email:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("e-mail:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("E-mail address:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Contact:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Alternative contact:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Telephone number:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Telephone No:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Fax number:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Telephone:", "address", 6, "Applicant information was found");
-		section.redactLineAfter("Company:", "address", 6, "Applicant information was found");
-		section.redactBetween("No:", "Fax", "address", 6, "Applicant information was found");
-		section.redactBetween("Contact:", "Tel.:", "address", 6, "Applicant information was found");
+		section.redactLineAfter("Name:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Address:", "Contact", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact point:",  "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Phone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Email:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("e-mail:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail address:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Alternative contact:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone No:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax number:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Company:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("No:", "Fax", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Contact:", "Tel.:", "address", 6, "Applicant information was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


@@ -81,20 +81,20 @@ rule "7: Redact contact information if Producer is found"
 	when
 		Section(text.toLowerCase().contains("producer of the plant protection") || text.toLowerCase().contains("producer of the active substance") || text.contains("Manufacturer of the active substance") || text.contains("Manufacturer:") || text.contains("Producer or producers of the active substance"))
 	then
-		section.redactLineAfter("Name:", "address", 7, "Producer was found");
-		section.redactBetween("Address:", "Contact", "address", 7, "Producer was found");
-		section.redactBetween("Contact:", "Phone", "address", 7, "Producer was found");
-		section.redactBetween("Contact:", "Telephone number:", "address", 7, "Producer was found");
-		section.redactBetween("Address:", "Manufacturing", "address", 7, "Producer was found");
-		section.redactLineAfter("Telephone:", "address", 7, "Producer was found");
-		section.redactLineAfter("Phone:", "address", 7, "Producer was found");
-		section.redactLineAfter("Fax:", "address", 7, "Producer was found");
-		section.redactLineAfter("E-mail:", "address", 7, "Producer was found");
-		section.redactLineAfter("Contact:", "address", 7, "Producer was found");
-		section.redactLineAfter("Fax number:", "address", 7, "Producer was found");
-		section.redactLineAfter("Telephone number:", "address", 7, "Producer was found");
-		section.redactLineAfter("Tel:", "address", 7, "Producer was found");
-		section.redactBetween("No:", "Fax", "address", 7, "Producer was found");
+		section.redactLineAfter("Name:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Address:", "Contact", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Contact:", "Phone", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Contact:", "Telephone number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("Address:", "Manufacturing", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Phone:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("E-mail:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Contact:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Fax number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Telephone number:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactLineAfter("Tel:", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redactBetween("No:", "Fax", "address", 7, "Producer was found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


@@ -112,8 +112,8 @@ rule "9: Redact if must redact entry is found"
 	when
 		Section(matchesType("must_redact"))
 	then
-		section.redact("name", 9, "must_redact entry was found.");
-		section.redact("address", 9, "must_redact entry was found.");
+		section.redact("name", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+		section.redact("address", 9, "must_redact entry was found.", "Reg (EC) No 1107/2009 Art. 63 (2g)");
 	end


@@ -121,14 +121,15 @@ rule "10: Redact Authors and Addresses in Reference Table if it is a Vertebrate
    when
        Section(rowEquals("Vertebrate study Y/N", "Y") || rowEquals("Vertebrate study Y/N", "Yes"))
    then
-        section.redactCell("Author(s)", 10, "name", "Redacted because row is a vertebrate study");
-        section.redact("address", 10, "Redacted because row is a vertebrate study");
+        section.redactCell("Author(s)", 10, "name", "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
+        section.redact("address", 10, "Redacted because row is a vertebrate study", "Reg (EC) No 1107/2009 Art. 63 (2g)");
        section.highlightCell("Vertebrate study Y/N", 10, "must_redact");
    end

+
 rule "11: Redact sponsor company"
    when
-        Section(text.toLowerCase().contains("batches produced at"))
+        Section(searchText.toLowerCase().contains("batches produced at"))
    then
-        section.redactIfPrecededBy("batches produced at", "sponsor", 11, "Redacted because it represents a sponsor company");
+        section.redactIfPrecededBy("batches produced at", "sponsor", 11, "Redacted because it represents a sponsor company", "Reg (EC) No 1107/2009 Art. 63 (2g)");
    end
Author	SHA1	Message	Date
deiflaender	e178393c23	Fixed paragraph recognition	2020-11-16 16:00:45 +01:00
deiflaender	f75aff5186	RED-692: Added matchedRule to RedactionLog	2020-11-16 11:55:58 +01:00
deiflaender	85d73dae47	RED-632: Set status DECLINED in RedactionLog for manual removals that are DECLINED	2020-11-12 16:14:45 +01:00
Dominique Eiflaender	1792eb554e	Pull request #66 : RED-629: Each annotation is one entry in the RedactionLog Merge in RED/redaction-service from RED-629 to master * commit '936683f94dd089d47b267cadb606c42b9e8b5515': RED-629: Each annotation is one entry in the RedactionLog	2020-11-11 15:39:08 +01:00
deiflaender	936683f94d	RED-629: Each annotation is one entry in the RedactionLog	2020-11-11 15:29:28 +01:00
Dominique Eiflaender	d2161e1b3f	Pull request #65 : RED-419: Avoid duplicate entries Merge in RED/redaction-service from RED-419 to master * commit 'efe49ac2c1ae8a27feb6e07c1b4614619a0b2ece': RED-419: Avoid duplicate entries	2020-11-05 12:34:20 +01:00
deiflaender	efe49ac2c1	RED-419: Avoid duplicate entries	2020-11-05 12:27:24 +01:00
Dominique Eiflaender	61352b565d	Pull request #64 : RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested Merge in RED/redaction-service from RED-515 to master * commit 'c6d3e3a4cf8f34bd2f129e1ae15ce9b142fc284c': RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested	2020-11-04 15:54:20 +01:00
deiflaender	c6d3e3a4cf	RED-515: Added manualRedactionType to redactionLog, to know if it must added or not in pdftron-redaction-service if it is requested	2020-11-04 15:47:00 +01:00
Thierry Goeckel	c650361ec2	Pull request #63 : Fix sponsor companies rule and add corresponding test Merge in RED/redaction-service from RED-473 to master * commit '122d5a556e35b961ba2199280f6836221c6f768c': Bump conf service version and remove obsolete object init Fix test Fix rule in drools file, too Fix sponsor companies rule and add corresponding test	2020-11-04 11:59:15 +01:00
Thierry Göckel	122d5a556e	Bump conf service version and remove obsolete object init	2020-11-04 11:49:13 +01:00
Thierry Göckel	355cb16679	Fix test	2020-11-03 21:10:17 +01:00
Thierry Göckel	c285c384ce	Fix rule in drools file, too	2020-11-03 20:48:23 +01:00
Thierry Göckel	02052fbb6a	Fix sponsor companies rule and add corresponding test	2020-11-03 20:47:11 +01:00
Dominique Eiflaender	329ad98a21	Pull request #62 : Temprorary exclude WebMvcMetricsAutoConfiguration till UNDERTOW-1743 is fixed Merge in RED/redaction-service from ExcludeMetrics to master * commit '843b32e68feae46f306c5e122ebfd98e6531fc86': Temprorary exclude WebMvcMetricsAutoConfiguration till UNDERTOW-1743 is fixed	2020-11-03 10:18:43 +01:00
deiflaender	843b32e68f	Temprorary exclude WebMvcMetricsAutoConfiguration till UNDERTOW-1743 is fixed	2020-11-03 09:57:00 +01:00
Dominique Eiflaender	3371b825ef	Pull request #61 : Removed id prefix Merge in RED/redaction-service from TimoTest to master * commit '6e83040a50728c491667bdbe211636d245e0cf6a': Removed id prefix	2020-11-03 09:15:28 +01:00
deiflaender	6e83040a50	Removed id prefix	2020-10-30 16:18:44 +01:00
Dominique Eiflaender	de66d2fda8	Pull request #60 : RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary Merge in RED/redaction-service from RED-510 to master * commit '1b2bd7fa209cba7e635bbaad7962396d931576ff': RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary	2020-10-29 15:37:37 +01:00
deiflaender	1b2bd7fa20	RED-510: Do not add annotations for manual redactions that are approved and should be already in a dictionary	2020-10-29 15:16:30 +01:00
Dominique Eiflaender	013353d6ef	Pull request #59 : RED-499: Changed prefix for redactions, fixed legalbasis problem Merge in RED/redaction-service from RED-499 to master * commit '0015304eea9564d76765fcb1a76d2b6a293c1ebc': RED-499: Changed prefix for redactions, fixed legalbasis problem	2020-10-28 13:55:41 +01:00
deiflaender	0015304eea	RED-499: Changed prefix for redactions, fixed legalbasis problem	2020-10-28 13:02:46 +01:00
Dominique Eiflaender	97257a9c08	Pull request #58 : RED-427: Added possibility to add comments to all annotation Merge in RED/redaction-service from RED-427 to master * commit '612d67301bbf186f5144c0243f9a37fe21d3646c': RED-427: Added possibility to add comments to all annotation	2020-10-27 13:02:50 +01:00
deiflaender	612d67301b	RED-427: Added possibility to add comments to all annotation	2020-10-27 12:32:11 +01:00
Thierry Goeckel	6986b14713	Pull request #57 : RED-451 Legal Basis Merge in RED/redaction-service from RED-451 to master * commit '8be59e4ddf2432f47a57d50e2743886c56af3652': Add legal basis to redaction log entry Integrate legal basis to rules, redaction annotation and tests	2020-10-27 12:00:59 +01:00
Thierry Göckel	8be59e4ddf	Add legal basis to redaction log entry	2020-10-26 15:03:21 +01:00
Thierry Göckel	f0f748db1b	Integrate legal basis to rules, redaction annotation and tests	2020-10-26 10:07:41 +01:00
Thierry Goeckel	04f0c29a49	Pull request #56 : Streamline actuator settings Merge in RED/redaction-service from actuator-settings to master * commit 'b5192b7424745360dc2206b45ec7f7667b867e27': Streamline actuator settings	2020-10-22 09:43:11 +02:00
Thierry Göckel	b5192b7424	Streamline actuator settings	2020-10-21 17:50:33 +02:00
Dominique Eiflaender	268dd0200e	Pull request #55 : RED-413: Added user to manual redactions, approved flag to Status.APPROVED Merge in RED/redaction-service from RED-413 to master * commit '638c4f9c65d35406bba1fd33e20c3bae8a6e6a13': RED-413: Added user to manual redactions, approved flag to Status.APPROVED	2020-10-12 12:32:30 +02:00
deiflaender	638c4f9c65	RED-413: Added user to manual redactions, approved flag to Status.APPROVED	2020-10-12 12:21:18 +02:00
Dominique Eiflaender	8f12695f16	Pull request #54 : RED-414: Ids for manual redactions and comments must be created in file-management-service Merge in RED/redaction-service from RED-414 to master * commit '79db6e4bf9d821fe4716a6da31d3f6d6fcaff05b': RED-414: Ids for manual redactions and comments must be created in file-management-service	2020-10-09 12:17:38 +02:00
deiflaender	79db6e4bf9	RED-414: Ids for manual redactions and comments must be created in file-management-service	2020-10-09 12:06:19 +02:00
Dominique Eiflaender	c8eac2ca3d	Pull request #53 : RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service Merge in RED/redaction-service from RED-240 to master * commit 'a01651b8278ed09f9409d6ec2e1615680bc846cb': RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service	2020-10-08 12:05:42 +02:00
deiflaender	a01651b827	RED-240: Use HexColors instead of float[], RED-380: Load all system colors from dictionary-service	2020-10-08 11:51:35 +02:00
Dominique Eiflaender	943d40366e	Pull request #52 : RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs Merge in RED/redaction-service from RED-391 to master * commit '365158a0084b2034aca91e6f77eb9df42bbcb246': RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs	2020-10-05 15:36:06 +02:00
deiflaender	365158a008	RED-391: Support comments and approval of manual redactions, RED-385: Improve annotation IDs in PDFs	2020-10-05 15:14:23 +02:00
Thierry Goeckel	e76b893c8d	Pull request #51 : RED-104 Merge in RED/redaction-service from RED-104 to master * commit 'fa29f56d98d05fd348dd27e3bbb1098851c238bd': Test line break fix	2020-10-05 11:02:56 +02:00
Thierry Goeckel	d91612a69a	Pull request #50 : Make sure section and table char indices match Merge in RED/redaction-service from RED-381 to master * commit '9a965dd68a72285af6bf6a28ec6aa67358c35dba': Make sure section and table char indices match	2020-10-05 11:02:44 +02:00
Thierry Göckel	fa29f56d98	Test line break fix	2020-10-02 18:11:58 +02:00
Thierry Göckel	9a965dd68a	Make sure section and table char indices match	2020-10-02 17:54:31 +02:00
Dominique Eiflaender	0f4838e60d	Pull request #49 : RED-373: Fixed multiline annotations view in pdftron Merge in RED/redaction-service from RED-373-2 to master * commit 'a4e012762e1adda234decc1137f221cfd70498d3': RED-373: Fixed multiline annotations view in pdftron	2020-10-01 15:31:25 +02:00
deiflaender	a4e012762e	RED-373: Fixed multiline annotations view in pdftron	2020-10-01 15:19:57 +02:00
Dominique Eiflaender	0c1d8ba33d	Pull request #48 : RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids Merge in RED/redaction-service from RED-372 to master * commit 'ecdfd29803e09ac57cc74b19408db54d9a8247a7': RED-372: Suffix cross page annotations with -1, -2, etc., to avoid duplicate annotation ids	2020-10-01 13:01:24 +02:00