First steps for incremental analysis

redaction-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.0.8</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.2.5</version>
+                <version>1.1.7</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

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

@@ -43,6 +43,4 @@ public class RedactionLogEntry {
     private int startOffset;
     private int endOffset;
 
-    private boolean isImage;
-
 }

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

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.2.9</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
@@ -73,7 +73,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-
+        <!-- ribbon must be included because transitive a dependency on it.-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -1,6 +1,10 @@
 package com.iqser.red.service.redaction.v1.server;
 
+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
@@ -8,14 +12,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Import;
 
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
 @Import({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 {
 
     public static void main(String[] args) {

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

@@ -4,13 +4,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.model.SectionText;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -26,8 +24,8 @@ public class Document {
     private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
     private Map<Integer, List<Entity>> entities = new HashMap<>();
     private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
-    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter= new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter= new StringFrequencyCounter();
     private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
     private boolean headlines;
 
@@ -37,7 +35,4 @@ public class Document {
     private long rulesVersion;
 
     private List<SectionText> sectionText = new ArrayList<>();
-
-    private Map<Integer, Set<Image>> images = new HashMap<>();
-
 }

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

@@ -1,8 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
 
@@ -17,7 +17,7 @@ public class Page {
     @NonNull
     private List<AbstractTextContainer> textBlocks;
 
-    private List<PdfImage> images;
+    private List<Rectangle2D> imageBounds;
 
     private Rectangle bodyTextFrame;
 
@@ -31,9 +31,7 @@ public class Page {
     private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
     private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
 
-
     public boolean isRotated() {
-
         return rotation != 0;
     }
 

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

@@ -3,7 +3,6 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -13,10 +12,9 @@ import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
-public class Paragraph implements Comparable{
+public class Paragraph {
 
     private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
-    private List<PdfImage> images = new ArrayList<>();
     private String headline;
 
 
@@ -55,11 +53,4 @@ public class Paragraph implements Comparable{
         return textBlocks;
     }
 
-
-    @Override
-    public int compareTo(Object o) {
-
-        return 0;
-    }
-
 }

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

@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.multipart.MultipartFile;
-
-@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
-public interface ImageClassificationClient {
-
-    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ImageClassificationResponse classify(@RequestBody MultipartFile file);
-
-}

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

@@ -1,13 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ImageClassificationResponse {
-
-    private String category;
-}

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

@@ -1,102 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-public class MockMultipartFile implements MultipartFile {
-
-    private final String name;
-    private final String originalFilename;
-    @Nullable
-    private final String contentType;
-    private final byte[] content;
-
-
-    public MockMultipartFile(String name, @Nullable byte[] content) {
-
-        this(name, "", (String) null, (byte[]) content);
-    }
-
-
-    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
-
-        this(name, "", (String) null, (byte[]) FileCopyUtils.copyToByteArray(contentStream));
-    }
-
-
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
-                             @Nullable byte[] content) {
-
-        Assert.hasLength(name, "Name must not be empty");
-        this.name = name;
-        this.originalFilename = originalFilename != null ? originalFilename : "";
-        this.contentType = contentType;
-        this.content = content != null ? content : new byte[0];
-    }
-
-
-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
-                             InputStream contentStream) throws IOException {
-
-        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
-    }
-
-
-    public String getName() {
-
-        return this.name;
-    }
-
-
-    @NonNull
-    public String getOriginalFilename() {
-
-        return this.originalFilename;
-    }
-
-
-    @Nullable
-    public String getContentType() {
-
-        return this.contentType;
-    }
-
-
-    public boolean isEmpty() {
-
-        return this.content.length == 0;
-    }
-
-
-    public long getSize() {
-
-        return (long) this.content.length;
-    }
-
-
-    public byte[] getBytes() throws IOException {
-
-        return this.content;
-    }
-
-
-    public InputStream getInputStream() throws IOException {
-
-        return new ByteArrayInputStream(this.content);
-    }
-
-
-    public void transferTo(File dest) throws IOException, IllegalStateException {
-
-        FileCopyUtils.copy(this.content, dest);
-    }
-
-}

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

@@ -20,7 +20,6 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationSer
 import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.EntityRedactionService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
@@ -54,7 +53,6 @@ public class RedactionController implements RedactionResource {
     private final DictionaryService dictionaryService;
     private final AnnotationService annotationService;
     private final ReanalyzeService reanalyzeService;
-    private final ImageClassificationService imageClassificationService;
 
 
     @Override
@@ -67,7 +65,6 @@ public class RedactionController implements RedactionResource {
 
             log.info("Document structure analysis successful, starting redaction analysis...");
 
-            imageClassificationService.classifyImages(classifiedDoc);
             entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
             redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
                     .getRuleSetId());

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

@@ -41,7 +41,6 @@ import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;
 
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
 
 import lombok.Getter;
@@ -59,7 +58,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
     @Getter
     private int maxCharWidth;
-
+    
     @Getter
     private int minCharHeight;
 
@@ -75,7 +74,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     private final List<Ruling> graphicsPath = new ArrayList<>();
 
     @Getter
-    private List<PdfImage> images = new ArrayList<>();
+    private List<Rectangle2D> imageBounds = new ArrayList<>();
 
     private float path_x;
     private float path_y;
@@ -223,7 +222,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                         .getWidth(), (float) imageBounds.getHeight());
 
                 if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                    this.imageBounds.add(rect);
                 }
             }
         } catch (Exception e) {
@@ -359,7 +358,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         minCharHeight = Integer.MAX_VALUE;
         maxCharHeight = 0;
         textPositionSequences.clear();
-        images = new ArrayList<>();
+        imageBounds = new ArrayList<>();
         rulings.clear();
         graphicsPath.clear();
         path_x = 0.0f;

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.parsing.model;
+
+import java.awt.geom.Rectangle2D;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ParsedElements {
+
+    private List<TextPositionSequence> sequences;
+    private List<Ruling> rulings;
+    private List<Rectangle2D> imageBounds;
+
+    private boolean landscape;
+    private boolean rotated;
+
+    private float minCharWidth;
+    private float maxCharWidth;
+}

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

@@ -101,13 +101,10 @@ public class TextPositionSequence implements CharSequence {
         }
     }
 
-
     public float getRotationAdjustedY() {
-
         return textPositions.get(0).getY();
     }
 
-
     public float getY1() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -205,13 +202,6 @@ public class TextPositionSequence implements CharSequence {
             posXEnd = textPositions.get(0).getYDirAdj() + 2;
             posYInit = getY1();
             posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-        } else if (textPositions.get(0).getRotation() == 270) {
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
-                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
         } else {
             posXEnd = textPositions.get(textPositions.size() - 1)
                     .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
@@ -223,4 +213,5 @@ public class TextPositionSequence implements CharSequence {
         return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
     }
 
+
 }

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

@@ -9,7 +9,7 @@ import lombok.Data;
 @AllArgsConstructor
 public class DictionaryIncrement {
 
-    private Set<DictionaryIncrementValue> values;
+    private Set<String> values;
     private long dictionaryVersion;
 
 }

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

@@ -1,13 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class DictionaryIncrementValue {
-
-    private String value;
-    private boolean caseinsensitive;
-
-}

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

@@ -3,9 +3,6 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;
 
 import java.io.Serializable;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,12 +17,11 @@ public class DictionaryModel implements Serializable {
     private boolean caseInsensitive;
     private boolean hint;
     private boolean recommendation;
-    private Set<DictionaryEntry> entries;
+    private Set<String> entries;
     private Set<String> localEntries;
 
     public Set<String> getValues(boolean local){
-        return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e-> e.getValue()).collect(Collectors
-                .toSet());
+        return local ? localEntries : entries;
     }
 
 }

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

@@ -1,26 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.awt.geom.Rectangle2D;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Image {
-
-    private String type;
-    private Rectangle2D position;
-    private boolean redaction;
-    private String redactionReason;
-    private String legalBasis;
-    private int matchedRule;
-    private int sectionNumber;
-    private String section;
-    private int page;
-
-}

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

@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-public enum ImageType {
-    LOGO, FORMULA, SIGNATURE, OTHER, OCR
-}

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

@@ -1,28 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.model;
-
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@RequiredArgsConstructor
-public class PdfImage {
-
-    @NonNull
-    private BufferedImage image;
-    @NonNull
-    private Rectangle2D position;
-    private ImageType imageType;
-    private boolean isAppendedToParagraph;
-
-    @NonNull
-    private int page;
-
-}

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

@@ -1,10 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 
@@ -20,7 +18,6 @@ public class ReanalysisSection {
     private List<TextBlock> textBlocks;
     private Map<String, CellValue> tabularData = new HashMap<>();
     private List<Integer> cellStarts;
-    private Set<Image> images = new HashSet<>();
 
 
     public SearchableText getSearchableText() {

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

@@ -51,9 +51,6 @@ public class Section {
 
     private SearchableText searchableText;
 
-    @Builder.Default
-    private Set<Image> images = new HashSet<>();
-
 
     public boolean rowEquals(String headerName, String value) {
 
@@ -78,12 +75,6 @@ public class Section {
     }
 
 
-    public boolean matchesImageType(String type) {
-
-        return images.stream().anyMatch(image -> image.getType().equals(type));
-    }
-
-
     public boolean headlineContainsWord(String word) {
 
         return StringUtils.containsIgnoreCase(headline, word);
@@ -118,19 +109,6 @@ public class Section {
     }
 
 
-    public void redactImage(String type, int ruleNumber, String reason, String legalBasis) {
-
-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(true);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-                image.setLegalBasis(legalBasis);
-            }
-        });
-    }
-
-
     public void redact(String type, int ruleNumber, String reason, String legalBasis) {
 
         boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
@@ -147,18 +125,6 @@ public class Section {
     }
 
 
-    public void redactNotImage(String type, int ruleNumber, String reason) {
-
-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(false);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-            }
-        });
-    }
-
-
     public void redactNot(String type, int ruleNumber, String reason) {
 
         boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
@@ -174,8 +140,7 @@ public class Section {
     }
 
 
-    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
-                                              String asType) {
+    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group, String asType) {
 
         Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
 

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

@@ -1,46 +1,43 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import com.iqser.red.service.configuration.v1.api.model.Colors;
+import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
+import com.iqser.red.service.configuration.v1.api.model.TypeResult;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;
+import feign.FeignException;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.SerializationUtils;
+import org.springframework.stereotype.Service;
+
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.SerializationUtils;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
-import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
-import com.iqser.red.service.configuration.v1.api.model.TypeResult;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;
-
-import feign.FeignException;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class DictionaryService {
 
+
     private final DictionaryClient dictionaryClient;
 
+
     private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();
 
 
-    public long updateDictionary(String ruleSetId) {
+    public void updateDictionary(String ruleSetId) {
 
         long version = dictionaryClient.getVersion(ruleSetId);
 
@@ -49,26 +46,14 @@ public class DictionaryService {
         if (foundDictionary == null || version > foundDictionary.getDictionaryVersion()) {
             updateDictionaryEntry(ruleSetId, version);
         }
-
-        return version;
     }
 
 
-    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, long fromVersion) {
+    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, long fromVersion){
 
-        long version = updateDictionary(ruleSetId);
+        updateDictionary(ruleSetId);
 
-        Set<DictionaryIncrementValue> newValues = new HashSet<>();
-        List<DictionaryModel> dictionaryModels = dictionariesByRuleSets.get(ruleSetId).getDictionary();
-        dictionaryModels.forEach(dictionaryModel -> {
-            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
-                if (dictionaryEntry.getVersion() > fromVersion) {
-                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
-                }
-            });
-        });
-
-        return new DictionaryIncrement(newValues, version);
+        return new DictionaryIncrement(Set.of("Properties"), 1L);
     }
 
 
@@ -87,6 +72,7 @@ public class DictionaryService {
                         .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
 
+
                 dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));
 
                 Colors colors = dictionaryClient.getColors(ruleSetId);
@@ -109,7 +95,6 @@ public class DictionaryService {
 
 
     public void updateExternalDictionary(Dictionary dictionary, String ruleSetId) {
-
         dictionary.getDictionaryModels().forEach(dm -> {
             if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
                 dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false);
@@ -122,15 +107,17 @@ public class DictionaryService {
     }
 
 
-    private Set<DictionaryEntry> convertEntries(TypeResult t) {
-
-        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId())
-                .getEntries());
+    private Set<String> convertEntries(TypeResult t) {
 
         if (t.isCaseInsensitive()) {
-            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
+            return dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId())
+                    .getEntries()
+                    .stream()
+                    .map(String::toLowerCase)
+                    .collect(Collectors.toSet());
+        } else {
+            return new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId()).getEntries());
         }
-        return entries;
     }
 
 
@@ -170,7 +157,6 @@ public class DictionaryService {
         return false;
     }
 
-
     public boolean isRecommendation(String type, String ruleSetId) {
 
         DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
@@ -182,7 +168,6 @@ public class DictionaryService {
 
 
     public Dictionary getDeepCopyDictionary(String ruleSetId) {
-
         List<DictionaryModel> copy = new ArrayList<>();
 
         var representation = dictionariesByRuleSets.get(ruleSetId);
@@ -194,22 +179,15 @@ public class DictionaryService {
         return new Dictionary(copy, representation.getDictionaryVersion());
     }
 
-
     public float[] getRequestRemoveColor(String ruleSetId) {
-
         return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
     }
 
-
     public float[] getNotRedactedColor(String ruleSetId) {
-
         return dictionariesByRuleSets.get(ruleSetId).getNotRedactedColor();
     }
 
-
     public float[] getRequestAddColor(String ruleSetId) {
-
         return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
     }
-
 }

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

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -20,25 +19,22 @@ 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.SectionArea;
-import com.iqser.red.service.redaction.v1.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
 import com.iqser.red.service.redaction.v1.server.classification.model.Header;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
 import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
+import com.iqser.red.service.redaction.v1.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -70,7 +66,7 @@ public class EntityRedactionService {
 
             Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
             documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                if (dictionary.isHint(entity.getType())) {
                     hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
                             .add(entity);
                 }
@@ -93,8 +89,7 @@ public class EntityRedactionService {
                         .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(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd()));
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity.getStart(), entity.getEnd()));
             }
         }
 
@@ -125,24 +120,22 @@ public class EntityRedactionService {
                 sectionNumber.incrementAndGet();
             }
             sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
-                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages()));
+                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
             sectionNumber.incrementAndGet();
         }
 
         for (Header header : classifiedDoc.getHeaders()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
             sectionNumber.incrementAndGet();
         }
 
         for (Footer footer : classifiedDoc.getFooters()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
             sectionNumber.incrementAndGet();
         }
 
         for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
-                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText.getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
             sectionNumber.incrementAndGet();
         }
 
@@ -150,10 +143,6 @@ public class EntityRedactionService {
             Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
             documentEntities.addAll(analysedRowSection.getEntities());
 
-            for (Image image : analysedRowSection.getImages()) {
-                classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
-            }
-
             analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
                 if (dictionary.isRecommendation(key)) {
                     analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
@@ -183,8 +172,7 @@ public class EntityRedactionService {
     }
 
 
-    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
-                                                               ManualRedactions manualRedactions,
+    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table, ManualRedactions manualRedactions,
                                                                AtomicInteger sectionNumber, Dictionary dictionary,
                                                                boolean local,
                                                                Map<Integer, Set<Entity>> hintsPerSectionNumber) {
@@ -204,11 +192,7 @@ public class EntityRedactionService {
                 }
 
                 SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                        .get(0)
-                        .getSequences()
-                        .get(0)
-                        .getPage());
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks().get(0).getSequences().get(0).getPage());
                 sectionText.getSectionAreas().add(sectionArea);
 
                 addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
@@ -253,7 +237,7 @@ public class EntityRedactionService {
                     .dictionary(dictionary)
                     .build(), searchableRow));
 
-            if (!local) {
+            if(!local) {
                 sectionText.setText(searchableRow.toString());
                 sectionText.setHeadline(table.getHeadline());
                 sectionText.setSectionNumber(sectionNumber.intValue());
@@ -268,8 +252,7 @@ public class EntityRedactionService {
     }
 
 
-    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
-                                                                  ManualRedactions manualRedactions,
+    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table, ManualRedactions manualRedactions,
                                                                   AtomicInteger sectionNumber, Dictionary dictionary,
                                                                   boolean local,
                                                                   Map<Integer, Set<Entity>> hintsPerSectionNumber) {
@@ -283,13 +266,9 @@ public class EntityRedactionService {
                     continue;
                 }
 
-                if (!local) {
+                if(!local) {
                     SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                            .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                            .get(0)
-                            .getSequences()
-                            .get(0)
-                            .getPage());
+                            .getWidth(), (float) cell.getHeight(), cell.getTextBlocks().get(0).getSequences().get(0).getPage());
                     sectionText.getSectionAreas().add(sectionArea);
                 }
 
@@ -300,6 +279,7 @@ public class EntityRedactionService {
             }
         }
 
+
         Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
         surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);
 
@@ -317,7 +297,7 @@ public class EntityRedactionService {
                 .dictionary(dictionary)
                 .build(), entireTableText));
 
-        if (!local) {
+        if(!local) {
             sectionText.setText(entireTableText.toString());
             sectionText.setHeadline(table.getHeadline());
             sectionText.setSectionNumber(sectionNumber.intValue());
@@ -329,14 +309,12 @@ public class EntityRedactionService {
     }
 
 
-    private SectionSearchableTextPair processText(Document classifiedDoc, SearchableText searchableText,
-                                                  List<TextBlock> paragraphTextBlocks, String headline,
-                                                  ManualRedactions manualRedactions, AtomicInteger sectionNumber,
-                                                  Dictionary dictionary, boolean local,
-                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                  List<PdfImage> images) {
+    private SectionSearchableTextPair processText(Document classifiedDoc, SearchableText searchableText, List<TextBlock> paragraphTextBlocks,
+                                                  String headline, ManualRedactions manualRedactions,
+                                                  AtomicInteger sectionNumber, Dictionary dictionary, boolean local,
+                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
 
-        if (!local) {
+        if(!local) {
             SectionText sectionText = new SectionText();
             for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
                 SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
@@ -367,15 +345,12 @@ public class EntityRedactionService {
                 .sectionNumber(sectionNumber.intValue())
                 .searchableText(searchableText)
                 .dictionary(dictionary)
-                .images(images.stream()
-                        .map(image -> convert(image, sectionNumber.intValue(), headline))
-                        .collect(Collectors.toSet()))
                 .build(), searchableText);
     }
 
 
     public Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                    Dictionary dictionary, boolean local) {
+                                     Dictionary dictionary, boolean local) {
 
         Set<Entity> found = new HashSet<>();
         String searchableString = searchableText.toString();
@@ -415,18 +390,4 @@ public class EntityRedactionService {
         }
     }
 
-
-    private Image convert(PdfImage pdfImage, int sectionNumber, String headline) {
-
-        return Image.builder()
-                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
-                        .name()
-                        .toLowerCase(Locale.ROOT))
-                .position(pdfImage.getPosition())
-                .sectionNumber(sectionNumber)
-                .section(headline)
-                .page(pdfImage.getPage())
-                .build();
-    }
-
 }

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

@@ -1,62 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
-import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ImageClassificationService {
-
-    private final ImageClassificationClient imageClassificationClient;
-    private final RedactionServiceSettings settings;
-
-
-    public void classifyImages(Document classifiedDoc) {
-
-        long start = System.currentTimeMillis();
-        classifiedDoc.getPages().forEach(page -> {
-            page.getImages().forEach(image -> {
-
-                if (settings.isEnableImageClassification()) {
-                    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                        ImageIO.write(image.getImage(), "png", baos);
-                        ImageClassificationResponse response = imageClassificationClient.classify(new MockMultipartFile("file", "Image.png", "image/png", baos
-                                .toByteArray()));
-                        image.setImageType(ImageType.valueOf(response.getCategory()));
-
-                    } catch (IOException e) {
-                        log.error("Could not classify image", e);
-                    }
-                } else {
-                    image.setImageType(ImageType.OTHER);
-                }
-
-                if (image.getImageType().equals(ImageType.OTHER)) {
-                    page.getTextBlocks().forEach(textblock -> {
-                        if (image.getPosition()
-                                .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
-                            image.setImageType(ImageType.OCR);
-                        }
-                    });
-                }
-            });
-        });
-        log.info("Image classification took: " + (System.currentTimeMillis() - start));
-    }
-
-}

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

@@ -39,7 +39,6 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.ReanalysisSection;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
@@ -76,19 +75,16 @@ public class ReanalyzeService {
         }
 
         Set<Integer> sectionsToReanaylse = new HashSet<>();
-        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
         for (RedactionLogEntry entry : renalyzeRequest.getRedactionLog().getRedactionLogEntry()) {
             if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
                 sectionsToReanaylse.add(entry.getSectionNumber());
             }
-            if (entry.isImage() || entry.getType().equals("image")) {
-                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
-            }
         }
 
         for (SectionText sectionText : renalyzeRequest.getText().getSectionTexts()) {
-
-            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+            Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), dictionaryIncrement.getValues(), "find", sectionText
+                    .getHeadline(), sectionText.getSectionNumber(), false);
+            if (!entities.isEmpty()) {
                 sectionsToReanaylse.add(sectionText.getSectionNumber());
             }
 
@@ -178,15 +174,10 @@ public class ReanalyzeService {
                 }
                 reanalysisSection.setTextBlocks(textBlocks);
                 reanalysisSection.setTabularData(tabularData);
-
+                reanalysisSections.add(reanalysisSection);
                 if (sectionText.isTable()) {
                     reanalysisSection.setCellStarts(cellStarts);
                 }
-                if (imageEntries.containsKey(sectionText.getSectionNumber())) {
-                    reanalysisSection.getImages().addAll(imageEntries.get(sectionText.getSectionNumber()));
-                }
-
-                reanalysisSections.add(reanalysisSection);
             }
 
             //--
@@ -218,22 +209,14 @@ public class ReanalyzeService {
                         .tabularData(reanalysisSection.getTabularData())
                         .searchableText(reanalysisSection.getSearchableText())
                         .dictionary(dictionary)
-                        .images(reanalysisSection.getImages())
                         .build(), reanalysisSection.getSearchableText()));
             }
 
             Set<Entity> entities = new HashSet<>();
-            Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
             sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
                 Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair
                         .getSection());
                 entities.addAll(analysedRowSection.getEntities());
-                EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-
-                for (Image image : analysedRowSection.getImages()) {
-                    imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
-                }
-
             });
 
             Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
@@ -259,12 +242,6 @@ public class ReanalyzeService {
                     newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, renalyzeRequest
                             .getManualRedactions(), page, renalyzeRequest.getRuleSetId()));
                 }
-
-                if (imagesPerPage.get(page) != null) {
-                    newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, renalyzeRequest
-                            .getManualRedactions(), page, renalyzeRequest.getRuleSetId()));
-                }
-
                 newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, renalyzeRequest
                         .getRuleSetId()));
             }
@@ -272,13 +249,12 @@ public class ReanalyzeService {
             Iterator<RedactionLogEntry> itty = renalyzeRequest.getRedactionLog().getRedactionLogEntry().iterator();
             while (itty.hasNext()) {
                 RedactionLogEntry entry = itty.next();
-                if (sectionsToReanaylse.contains(entry.getSectionNumber())) {
+                if (sectionsToReanaylse.contains(entry.getSectionNumber()) || entry.getSectionNumber() == 0) {
                     itty.remove();
                 }
             }
 
             renalyzeRequest.getRedactionLog().getRedactionLogEntry().addAll(newRedactionLogEntries);
-
             renalyzeRequest.getRedactionLog().setDictionaryVersion(dictionaryIncrement.getDictionaryVersion());
 
             return ReanalyzeResult.builder().redactionLog(renalyzeRequest.getRedactionLog()).build();
@@ -302,19 +278,4 @@ public class ReanalyzeService {
                 .collect(Collectors.toSet());
     }
 
-
-    public Image convert(RedactionLogEntry entry) {
-
-        Rectangle position = entry.getPositions().get(0);
-
-        return Image.builder()
-                .type(entry.getType())
-                .position(new Rectangle2D.Float(position.getTopLeft().getX(), position.getTopLeft()
-                        .getY(), position.getWidth(), position.getHeight()))
-                .sectionNumber(entry.getSectionNumber())
-                .section(entry.getSection())
-                .page(position.getPage())
-                .build();
-    }
-
 }

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

@@ -1,5 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -29,7 +30,6 @@ 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.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 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;
@@ -41,6 +41,8 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class RedactionLogCreatorService {
 
+    private static final String IMAGE = "image";
+
     private final DictionaryService dictionaryService;
 
 
@@ -54,110 +56,37 @@ public class RedactionLogCreatorService {
             addSectionGrid(classifiedDoc, page);
 
             if (classifiedDoc.getEntities().get(page) != null) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, ruleSetId));
+                classifiedDoc.getRedactionLogEntities().addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, ruleSetId));
             }
 
             if (manualRedactionPages.contains(page)) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
+                classifiedDoc.getRedactionLogEntities().addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
             }
 
-            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, ruleSetId));
+            if (!classifiedDoc.getPages().get(page - 1).getImageBounds().isEmpty()) {
+                addImageEntries(classifiedDoc, page, ruleSetId);
             }
         }
     }
 
 
-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
-                                                   int pageNumber, String ruleSetId) {
-
-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        for (Image image : images.get(pageNumber)) {
-
-            String id = IdBuilder.buildId(image.getPosition(), pageNumber);
+    private void addImageEntries(Document classifiedDoc, int pageNumber, String ruleSetId) {
 
+        for (Rectangle2D imageBounds : classifiedDoc.getPages().get(pageNumber - 1).getImageBounds()) {
             RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
-                    .id(id)
-                    .color(getColorForImage(image, ruleSetId, false))
-                    .isImage(true)
-                    .type(image.getType())
-                    .redacted(image.isRedaction())
-                    .reason(image.getRedactionReason())
-                    .legalBasis(image.getLegalBasis())
-                    .matchedRule(image.getMatchedRule())
-                    .isHint(dictionaryService.isHint(image.getType(), ruleSetId))
+                    .id(IdBuilder.buildId(imageBounds, pageNumber))
+                    .color(getColor(IMAGE, ruleSetId))
+                    .type(IMAGE)
+                    .redacted(false)
+                    .isHint(true)
                     .manual(false)
                     .isDictionaryEntry(false)
                     .isRecommendation(false)
-                    .positions(List.of(new Rectangle(new Point((float) image.getPosition()
-                            .getX(), (float) image.getPosition().getY()), (float) image.getPosition()
-                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
-                    .sectionNumber(image.getSectionNumber())
-                    .section(image.getSection())
+                    .positions(List.of(new Rectangle(new Point((float) imageBounds.getX(), (float) imageBounds.getY()), (float) imageBounds
+                            .getWidth(), (float) imageBounds.getHeight(), pageNumber)))
                     .build();
-
-            if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                    if (manualRemoval.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(false);
-                            redactionLogEntry.setRedacted(false);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            manualOverrideReason = image.getRedactionReason() + ", removed by manual override";
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, false));
-                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, true));
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    }
-                }
-            }
-
-            if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                    if (manualForceRedact.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(true);
-                            redactionLogEntry.setRedacted(true);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, false));
-                            manualOverrideReason = image.getRedactionReason() + ", forced by manual override";
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to force redact";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, true));
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                    }
-                }
-            }
-
-            redactionLogEntities.add(redactionLogEntry);
+            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
         }
-
-        return redactionLogEntities;
     }
 
 
@@ -178,8 +107,7 @@ public class RedactionLogCreatorService {
     }
 
 
-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
-                                              int page, String ruleSetId) {
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions, int page, String ruleSetId) {
 
         List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
 
@@ -310,9 +238,8 @@ public class RedactionLogCreatorService {
     }
 
 
-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, int page,
-                                                       String ruleSetId) {
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,  Map<String, List<Comment>> comments, int page,
+                                  String ruleSetId) {
 
         List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
 
@@ -424,18 +351,6 @@ public class RedactionLogCreatorService {
     }
 
 
-    private float[] getColorForImage(Image image, String ruleSetId, boolean requestedToRemove) {
-
-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(ruleSetId);
-        }
-        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), ruleSetId)) {
-            return dictionaryService.getNotRedactedColor(ruleSetId);
-        }
-        return dictionaryService.getColor(image.getType(), ruleSetId);
-    }
-
-
     private boolean isHint(Entity entity, String ruleSetId) {
 
         return dictionaryService.isHint(entity.getType(), ruleSetId);

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

@@ -5,14 +5,12 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
 import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
@@ -22,40 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @UtilityClass
-@SuppressWarnings("PMD")
 public class EntitySearchUtils {
 
-
-    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {
-
-        String inputString = sectionText.toLowerCase(Locale.ROOT);
-
-        for (DictionaryIncrementValue value : values) {
-
-            String cleanValue = value.getValue().toLowerCase(Locale.ROOT).trim();
-
-            if (cleanValue.length() <= 2) {
-                continue;
-            }
-
-            int startIndex;
-            int stopIndex = 0;
-            do {
-                startIndex = inputString.indexOf(cleanValue, stopIndex);
-                stopIndex = startIndex + cleanValue.length();
-
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
-                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    if(value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())){
-                        return true;
-                    }
-                }
-            } while (startIndex > -1);
-        }
-        return false;
-    }
-
-
     public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
                             boolean local) {
 

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

@@ -15,6 +15,7 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
 import com.iqser.red.service.redaction.v1.server.classification.service.ClassificationService;
 import com.iqser.red.service.redaction.v1.server.parsing.PDFLinesTextStripper;
+import com.iqser.red.service.redaction.v1.server.parsing.model.ParsedElements;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
@@ -56,10 +57,19 @@ public class PdfSegmentationService {
             int rotation = pdPage.getRotation();
             boolean isRotated = rotation != 0 && rotation != 360;
 
-            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
-                    .getMaxCharHeight());
+            ParsedElements parsedElements = ParsedElements.builder()
+                    .rulings(stripper.getRulings())
+                    .sequences(stripper.getTextPositionSequences())
+                    .imageBounds(stripper.getImageBounds())
+                    .minCharWidth(stripper.getMinCharWidth())
+                    .maxCharWidth(stripper.getMaxCharWidth())
+                    .landscape(isLandscape)
+                    .rotated(isRotated)
+                    .build();
 
-            Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
+            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), stripper.getMinCharWidth(), stripper.getMaxCharHeight());
+
+            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings
                     .getVertical());
             page.setRotation(rotation);
 
@@ -67,20 +77,19 @@ public class PdfSegmentationService {
 
             buildPageStatistics(page);
 
-            page.setLandscape(isLandscape || isRotated);
+            page.setLandscape(parsedElements.isLandscape() || parsedElements.isRotated());
 
             page.setPageNumber(pageNumber);
             increaseDocumentStatistics(page, document);
-
-            page.setImages(stripper.getImages());
+            page.setImageBounds(parsedElements.getImageBounds());
             pages.add(page);
         }
 
         document.setPages(pages);
 
         classificationService.classifyDocument(document);
+
         sectionsBuilderService.buildSections(document);
-        sectionsBuilderService.addImagesToSections(document);
 
         return document;
     }

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

@@ -2,12 +2,8 @@ package com.iqser.red.service.redaction.v1.server.segmentation;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -20,7 +16,6 @@ import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.model.UnclassifiedText;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 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,13 +85,13 @@ public class SectionsBuilderService {
                 prev = current;
             }
 
-            if (!header.isEmpty()) {
+            if(!header.isEmpty()) {
                 headers.add(new Header(header));
             }
-            if (!footer.isEmpty()) {
+            if(!footer.isEmpty()) {
                 footers.add(new Footer(footer));
             }
-            if (!unclassifiedText.isEmpty()) {
+            if(!unclassifiedText.isEmpty()) {
                 unclassifiedTexts.add(new UnclassifiedText(unclassifiedText));
             }
         }
@@ -112,59 +107,6 @@ public class SectionsBuilderService {
     }
 
 
-    public void addImagesToSections(Document document) {
-
-        Map<Integer, SortedSet<Paragraph>> paragraphMap = new HashMap<>();
-        for (Paragraph paragraph : document.getParagraphs()) {
-            for (AbstractTextContainer container : paragraph.getPageBlocks()) {
-                paragraphMap.computeIfAbsent(container.getPage(), x -> new TreeSet<>()).add(paragraph);
-            }
-        }
-
-        if (paragraphMap.isEmpty()) {
-            Paragraph paragraph = new Paragraph();
-            document.getParagraphs().add(paragraph);
-            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
-        }
-
-        for (Page page : document.getPages()) {
-            for (PdfImage image : page.getImages()) {
-                SortedSet<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
-                if (paragraphsOnPage == null) {
-                    int i = page.getPageNumber();
-                    while (paragraphsOnPage == null) {
-                        paragraphsOnPage = paragraphMap.get(i);
-                        i--;
-                    }
-                }
-
-                Float perviousEnd = 0f;
-                for (Paragraph paragraph : paragraphsOnPage) {
-                    Float currentEnd = 0f;
-                    for (AbstractTextContainer abs : paragraph.getPageBlocks()) {
-                        if (abs.getPage() != page.getPageNumber()) {
-                            continue;
-                        }
-                        if (abs.getMaxY() > currentEnd) {
-                            currentEnd = abs.getMaxY();
-                        }
-                    }
-
-                    if (image.getPosition().getY() >= perviousEnd && image.getPosition().getY() <= currentEnd) {
-                        paragraph.getImages().add(image);
-                        image.setAppendedToParagraph(true);
-                    }
-                    perviousEnd = currentEnd;
-                }
-                if (!image.isAppendedToParagraph()) {
-                    paragraphsOnPage.first().getImages().add(image);
-                    image.setAppendedToParagraph(true);
-                }
-            }
-        }
-    }
-
-
     private void mergeTableMetadata(Table currentTable, Table previousTable) {
 
         // Distribute header information for subsequent tables

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

@@ -12,6 +12,4 @@ public class RedactionServiceSettings {
 
     private int surroundingWordsOffsetWindow = 100;
 
-    private boolean enableImageClassification = true;
-
 }

redaction-service-v1/redaction-service-server-v1/src/main/resources/application.yml

@@ -2,7 +2,6 @@ info:
   description: Redaction Service Server V1
 
 configuration-service.url: "http://configuration-service-v1:8080"
-image-service.url: "http://image-service-v1:8080"
 
 server:
   port: 8080

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -4,8 +4,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
+import java.awt.Color;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -17,6 +21,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -24,7 +29,15 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.util.Matrix;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kie.api.KieServices;
@@ -42,7 +55,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
 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;
@@ -63,14 +75,22 @@ 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.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
 import com.iqser.red.service.redaction.v1.model.SectionText;
 import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.parsing.PDFAreaTextStripper;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.ReanalysisSection;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = RANDOM_PORT)
@@ -89,10 +109,6 @@ public class RedactionIntegrationTest {
     private static final String TEST_METHOD = "test_method";
     private static final String PURITY = "purity";
     private static final String IMAGE = "image";
-    private static final String LOGO = "logo";
-    private static final String SIGNATURE = "signature";
-    private static final String FORMULA = "formula";
-    private static final String OCR = "ocr";
 
     private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
     private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
@@ -113,9 +129,6 @@ public class RedactionIntegrationTest {
     @MockBean
     private DictionaryClient dictionaryClient;
 
-    @MockBean
-    private ImageClassificationClient imageClassificationClient;
-
     private final Map<String, List<String>> dictionary = new HashMap<>();
     private final Map<String, String> typeColorMap = new HashMap<>();
     private final Map<String, Boolean> hintTypeMap = new HashMap<>();
@@ -123,7 +136,6 @@ public class RedactionIntegrationTest {
     private final Map<String, Boolean> recommendationTypeMap = new HashMap<>();
     private final Map<String, Integer> rankTypeMap = new HashMap<>();
     private final Colors colors = new Colors();
-    private final Map<String, Long> reanlysisVersions = new HashMap<>();
 
     private final static String TEST_RULESET_ID = "123";
 
@@ -177,10 +189,6 @@ public class RedactionIntegrationTest {
         when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
         when(dictionaryClient.getDictionaryForType(PURITY, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PURITY));
         when(dictionaryClient.getDictionaryForType(IMAGE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(IMAGE));
-        when(dictionaryClient.getDictionaryForType(OCR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(OCR));
-        when(dictionaryClient.getDictionaryForType(LOGO, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(LOGO));
-        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(SIGNATURE));
-        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FORMULA));
         when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
     }
 
@@ -263,27 +271,7 @@ public class RedactionIntegrationTest {
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
         dictionary.computeIfAbsent(IMAGE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(OCR, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(LOGO, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(SIGNATURE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt")
-                        .stream()
-                        .map(this::cleanDictionaryEntry)
-                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(FORMULA, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                .addAll(ResourceLoader.load("dictionaries/image.txt")
                         .stream()
                         .map(this::cleanDictionaryEntry)
                         .collect(Collectors.toSet()));
@@ -314,10 +302,6 @@ public class RedactionIntegrationTest {
         typeColorMap.put(FALSE_POSITIVE, "#ffffff");
         typeColorMap.put(PURITY, "#ffe187");
         typeColorMap.put(IMAGE, "#fcc5fb");
-        typeColorMap.put(OCR, "#fcc5fb");
-        typeColorMap.put(LOGO, "#ffe187");
-        typeColorMap.put(FORMULA, "#ffe187");
-        typeColorMap.put(SIGNATURE, "#ffe187");
 
         hintTypeMap.put(VERTEBRATE, true);
         hintTypeMap.put(ADDRESS, false);
@@ -335,10 +319,6 @@ public class RedactionIntegrationTest {
         hintTypeMap.put(FALSE_POSITIVE, true);
         hintTypeMap.put(PURITY, false);
         hintTypeMap.put(IMAGE, true);
-        hintTypeMap.put(OCR, true);
-        hintTypeMap.put(FORMULA, false);
-        hintTypeMap.put(LOGO, false);
-        hintTypeMap.put(SIGNATURE, false);
 
         caseInSensitiveMap.put(VERTEBRATE, true);
         caseInSensitiveMap.put(ADDRESS, false);
@@ -356,10 +336,6 @@ public class RedactionIntegrationTest {
         caseInSensitiveMap.put(FALSE_POSITIVE, false);
         caseInSensitiveMap.put(PURITY, false);
         caseInSensitiveMap.put(IMAGE, true);
-        caseInSensitiveMap.put(OCR, true);
-        caseInSensitiveMap.put(SIGNATURE, true);
-        caseInSensitiveMap.put(LOGO, true);
-        caseInSensitiveMap.put(FORMULA, true);
 
         recommendationTypeMap.put(VERTEBRATE, false);
         recommendationTypeMap.put(ADDRESS, false);
@@ -377,10 +353,6 @@ public class RedactionIntegrationTest {
         recommendationTypeMap.put(FALSE_POSITIVE, false);
         recommendationTypeMap.put(PURITY, false);
         recommendationTypeMap.put(IMAGE, false);
-        recommendationTypeMap.put(OCR, false);
-        recommendationTypeMap.put(FORMULA, false);
-        recommendationTypeMap.put(SIGNATURE, false);
-        recommendationTypeMap.put(LOGO, false);
 
         rankTypeMap.put(FALSE_POSITIVE, 160);
         rankTypeMap.put(PURITY, 155);
@@ -398,10 +370,6 @@ public class RedactionIntegrationTest {
         rankTypeMap.put(RECOMMENDATION_AUTHOR, 40);
         rankTypeMap.put(RECOMMENDATION_ADDRESS, 30);
         rankTypeMap.put(IMAGE, 30);
-        rankTypeMap.put(OCR, 29);
-        rankTypeMap.put(LOGO, 28);
-        rankTypeMap.put(SIGNATURE, 27);
-        rankTypeMap.put(FORMULA, 26);
 
         colors.setDefaultColor("#acfc00");
         colors.setNotRedacted("#cccccc");
@@ -432,7 +400,7 @@ public class RedactionIntegrationTest {
 
         return DictionaryResponse.builder()
                 .hexColor(typeColorMap.get(type))
-                .entries(toDictionaryEntry(dictionary.get(type)))
+                .entries(dictionary.get(type))
                 .isHint(hintTypeMap.get(type))
                 .isCaseInsensitive(caseInSensitiveMap.get(type))
                 .isRecommendation(recommendationTypeMap.get(type))
@@ -441,16 +409,6 @@ public class RedactionIntegrationTest {
     }
 
 
-    private List<DictionaryEntry> toDictionaryEntry(List<String> entries) {
-
-        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
-        entries.forEach(entry -> {
-            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, false));
-        });
-        return dictionaryEntries;
-    }
-
-
     @Test
     public void noExceptionShouldBeThrownForAnyFiles() throws IOException {
 
@@ -480,6 +438,7 @@ public class RedactionIntegrationTest {
                 assertThat(entry.getValue().size()).isEqualTo(1);
             });
 
+
             dictionary.get(AUTHOR).add("Drinking water");
             when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(1L);
 
@@ -527,7 +486,7 @@ public class RedactionIntegrationTest {
 
         System.out.println("redactionTest");
         long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
 
         AnalyzeRequest request = AnalyzeRequest.builder()
                 .ruleSetId(TEST_RULESET_ID)
@@ -536,12 +495,6 @@ public class RedactionIntegrationTest {
 
         AnalyzeResult result = redactionController.analyze(request);
 
-        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
-            if (entry.isImage()) {
-                System.out.println("---->" + entry.getType());
-            }
-        });
-
         long end = System.currentTimeMillis();
 
         System.out.println("first analysis duration: " + (end - start));
@@ -554,7 +507,7 @@ public class RedactionIntegrationTest {
         loop:
         for (RedactionLogEntry redactionLogEntry : result.getRedactionLog().getRedactionLogEntry()) {
             for (SectionText sectionText : result.getText().getSectionTexts()) {
-                if (redactionLogEntry.isImage()) {
+                if (redactionLogEntry.getType().equals("image")) {
                     correctFound++;
                     continue loop;
                 }
@@ -571,23 +524,15 @@ public class RedactionIntegrationTest {
         }
         assertThat(correctFound).isEqualTo(result.getRedactionLog().getRedactionLogEntry().size());
 
-        dictionary.get(AUTHOR).add("properties");
-        reanlysisVersions.put("properties", 1L);
 
-        dictionary.get(AUTHOR).add("physical");
-        reanlysisVersions.put("physical", 2L);
-
-        dictionary.get(VERTEBRATE).add("s-metolachlor");
-        reanlysisVersions.put("s-metolachlor", 3L);
-
-        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(3L);
-
-        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE));
+        dictionary.get(AUTHOR).add("Properties");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(1L);
 
         start = System.currentTimeMillis();
         ReanalyzeResult reanalyzeResult = redactionController.reanalyze(RenalyzeRequest.builder()
                 .redactionLog(result.getRedactionLog())
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .manualRedactions(null)
                 .text(result.getText())
                 .ruleSetId(TEST_RULESET_ID)
                 .build());
@@ -608,6 +553,127 @@ public class RedactionIntegrationTest {
     }
 
 
+
+    @Test
+    @Ignore
+    public void fillRecanTest() throws IOException {
+
+        System.out.println("redactionTest");
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/S5.pdf");
+
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .redactionLog(result.getRedactionLog())
+                .sectionGrid(result.getSectionGrid())
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) {
+            fileOutputStream.write(objectMapper.writeValueAsBytes(result.getText()));
+        }
+
+        int correctFound = 0;
+        loop:
+        for (RedactionLogEntry redactionLogEntry : result.getRedactionLog().getRedactionLogEntry()) {
+            for (SectionText sectionText : result.getText().getSectionTexts()) {
+                if (redactionLogEntry.getType().equals("image")) {
+                    correctFound++;
+                    continue loop;
+                }
+                if (redactionLogEntry.getSectionNumber() == sectionText.getSectionNumber()) {
+                    String value = sectionText.getText()
+                            .substring(redactionLogEntry.getStartOffset(), redactionLogEntry.getEndOffset());
+                    if (redactionLogEntry.getValue().equalsIgnoreCase(value)) {
+                        correctFound++;
+                    } else {
+                        throw new RuntimeException("WTF");
+                    }
+                }
+            }
+        }
+        assertThat(correctFound).isEqualTo(result.getRedactionLog().getRedactionLogEntry().size());
+
+        System.out.println("correctFound " + correctFound);
+
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+
+        SectionArea sectionArea = result.getText().getSectionTexts().get(3).getSectionAreas().get(5);
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(IOUtils.toByteArray(pdfFileResource.getInputStream())))) {
+
+            PDPage docPage = pdDocument.getPage(0);
+
+            PDFTextStripperByArea textStripper = new PDFTextStripperByArea();
+
+            PDRectangle cropBox = docPage.getCropBox();
+            PDRectangle mediaBox = docPage.getMediaBox();
+
+
+//            if (textPositions.get(0).getRotation() == 90) {
+//                posXEnd = textPositions.get(0).getYDirAdj() + 2;
+//                posYInit = getY1();
+//                posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
+//            } else {
+//                posXEnd = textPositions.get(textPositions.size() - 1)
+//                        .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+//                posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+//                posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+//                        .getYDirAdj() + 2;
+//            }
+
+
+            Rectangle2D rect = new Rectangle2D.Float(sectionArea.getTopLeft()
+                    .getY(), sectionArea.getTopLeft()
+                    .getX() , sectionArea.getHeight(), sectionArea
+                    .getWidth() + 0.001f);
+
+            textStripper.addRegion("region", rect);
+
+
+
+            textStripper.extractRegions(docPage);
+
+            String textForRegion = textStripper.getTextForRegion("region");
+
+            System.out.println(textForRegion);
+
+            // fill a rectangle
+            PDPageContentStream contents = new PDPageContentStream (pdDocument, docPage, PDPageContentStream.AppendMode.APPEND, false, false);
+            contents.setNonStrokingColor (Color.RED);
+            contents.addRect (sectionArea.getTopLeft().getX(), sectionArea.getTopLeft().getY(), sectionArea.getWidth(), sectionArea.getHeight());
+            contents.fill ();
+            contents.close ();
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated2.pdf")) {
+                    fileOutputStream.write(byteArrayOutputStream.toByteArray());
+                }
+            }
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+    }
+
+
+
+
+
     @Test
     public void testTableRedaction() throws IOException {
 
@@ -694,6 +760,7 @@ public class RedactionIntegrationTest {
                 .status(Status.APPROVED)
                 .build()));
 
+
         ReanalyzeResult reanalyzeResult = redactionController.reanalyze(RenalyzeRequest.builder()
                 .redactionLog(result.getRedactionLog())
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -702,6 +769,7 @@ public class RedactionIntegrationTest {
                 .ruleSetId(TEST_RULESET_ID)
                 .build());
 
+
         AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
                 .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                 .redactionLog(reanalyzeResult.getRedactionLog())

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/redaction/service/EntityRedactionServiceTest.java

@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
 import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
 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;
@@ -130,12 +129,12 @@ public class EntityRedactionServiceTest {
                 .build();
 
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                 .build();
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
@@ -163,12 +162,12 @@ public class EntityRedactionServiceTest {
                 .build();
 
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                 .build();
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
         DictionaryResponse sponsorResponse = DictionaryResponse.builder()
@@ -192,11 +191,11 @@ public class EntityRedactionServiceTest {
                 " Supplement - Identity of the active substance - Reference list.pdf");
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
         DictionaryResponse sponsorResponse = DictionaryResponse.builder()
@@ -229,15 +228,15 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
         DictionaryResponse sponsorResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -298,11 +297,11 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
         DictionaryResponse sponsorResponse = DictionaryResponse.builder()
@@ -347,7 +346,7 @@ public class EntityRedactionServiceTest {
                 .build();
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(authorResponse);
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .entries(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt")))
                 .build();
         when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
@@ -368,13 +367,13 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation.pdf");
 
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Arrays.asList("Bissig R.", "Thanei P.")))
+                .entries(Arrays.asList("Bissig R.", "Thanei P."))
                 .build();
 
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
@@ -393,13 +392,13 @@ public class EntityRedactionServiceTest {
         pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation2.pdf");
 
         dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C.")))
+                .entries(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C."))
                 .build();
 
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
@@ -420,13 +419,13 @@ public class EntityRedactionServiceTest {
         ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Empty Tabular Data.pdf");
 
         DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Aldershof S.")))
+                .entries(Collections.singletonList("Aldershof S."))
                 .build();
 
         when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
         when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
         DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .entries(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland"))
                 .build();
         when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
 
@@ -518,12 +517,4 @@ public class EntityRedactionServiceTest {
         }
     }
 
-    private List<DictionaryEntry> toDictionaryEntry(List<String> entries){
-        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
-        entries.forEach(entry -> {
-            dictionaryEntries.add(new DictionaryEntry(entry, 1L, false));
-        });
-        return dictionaryEntries;
-    }
-
 }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/segmentation/PdfSegmentationServiceTest.java

@@ -2,17 +2,12 @@ package com.iqser.red.service.redaction.v1.server.segmentation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.imageio.ImageIO;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kie.api.runtime.KieContainer;
@@ -23,10 +18,7 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
@@ -53,25 +45,24 @@ public class PdfSegmentationServiceTest {
 
 
     @Test
-    @Ignore
-    public void testExtractImages() throws IOException {
+    public void testPDFSegmentationWithComplexTable() throws IOException {
 
-        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Spanning Cells.pdf");
 
         try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
             Document document = pdfSegmentationService.parseDocument(pdDocument);
-            int i = 0;
-            for (Page page : document.getPages()) {
-                for (PdfImage image : page.getImages()) {
-                    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                        ImageIO.write(image.getImage(), "png", baos);
-                        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Image " + i + ".png")) {
-                            fileOutputStream.write(baos.toByteArray());
-                        }
-                    }
-                    i++;
-                }
-            }
+            assertThat(document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())).isNotEmpty();
+            Table table = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(0);
+            assertThat(table.getColCount()).isEqualTo(6);
+            assertThat(table.getRowCount()).isEqualTo(13);
+            assertThat(table.getRows().stream().mapToInt(List::size).sum()).isEqualTo(6 * 13);
         }
     }
 
@@ -106,12 +97,12 @@ public class PdfSegmentationServiceTest {
                     .stream()
                     .map(Collections::singletonList)
                     .collect(Collectors.toList());
-            assertThat(secondTable.getRows()
-                    .stream()
+            assertThat(secondTable.getRows().stream()
                     .allMatch(row -> row.stream()
                             .map(Cell::getHeaderCells)
                             .collect(Collectors.toList())
-                            .equals(firstTableHeaderCells))).isTrue();
+                            .equals(firstTableHeaderCells)))
+                    .isTrue();
         }
     }
 
@@ -146,12 +137,12 @@ public class PdfSegmentationServiceTest {
                     .stream()
                     .map(Cell::getHeaderCells)
                     .collect(Collectors.toList());
-            assertThat(secondTable.getRows()
-                    .stream()
+            assertThat(secondTable.getRows().stream()
                     .allMatch(row -> row.stream()
                             .map(Cell::getHeaderCells)
                             .collect(Collectors.toList())
-                            .equals(firstTableHeaderCells))).isTrue();
+                            .equals(firstTableHeaderCells)))
+                    .isTrue();
         }
     }
 
@@ -186,12 +177,12 @@ public class PdfSegmentationServiceTest {
                     .stream()
                     .map(Collections::singletonList)
                     .collect(Collectors.toList());
-            assertThat(secondTable.getRows()
-                    .stream()
+            assertThat(secondTable.getRows().stream()
                     .allMatch(row -> row.stream()
                             .map(Cell::getHeaderCells)
                             .collect(Collectors.toList())
-                            .equals(firstTableHeaderCells))).isTrue();
+                            .equals(firstTableHeaderCells)))
+                    .isTrue();
         }
     }
 

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -1,5 +1,4 @@
 configuration-service.url: "http://configuration-service-v1:8080"
-image-service.url: "http://image-service-v1:8080"
 
 ribbon:
   ConnectTimeout: 600000
@@ -13,6 +12,3 @@ processing.kafkastreams: false
 
 platform.multi-tenancy:
   enabled: false
-
-redaction-service:
-  enable-image-classification: false

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

@@ -258,28 +258,4 @@ rule "22: Redact Must Redact"
         Section(matchesType("must_redact"))
     then
         section.redact("must_redact", 22, "Must Redact found", "Article 39(1)(2) of Regulation (EC) No 178/2002");
-    end
-
-
-rule "23: Redact signatures"
-    when
-        Section(matchesImageType("signature"))
-    then
-        section.redactImage("signature", 23, "Signature found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "24: Redact formula"
-    when
-        Section(matchesImageType("formula"))
-    then
-        section.redactImage("formula", 24, "Formula found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "25: Redact Logos"
-    when
-        Section(matchesImageType("logo"))
-    then
-        section.redactImage("logo", 25, "Logo found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
     end

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

@@ -304,28 +304,4 @@ rule "25: Redact Purity"
         Section(searchText.contains("purity"))
     then
 	    section.redactByRegEx("purity ?:? (([\\d\\.]+)( .{0,4}\\.)? ?%)", true, 1, "purity", 17, "Purity found", "Reg (EC) No 1107/2009 Art. 63 (2a)");
-    end
-
-
-rule "26: Redact signatures"
-    when
-        Section(matchesImageType("signature"))
-    then
-        section.redactImage("signature", 26, "Signature found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "27: Redact formula"
-    when
-        Section(matchesImageType("formula"))
-    then
-        section.redactImage("formula", 27, "Formula found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
-    end
-
-
-rule "28: Redact Logos"
-    when
-        Section(matchesImageType("logo"))
-    then
-        section.redactImage("logo", 28, "Logo found", "Reg (EC) No 1107/2009 Art. 63 (2g)");
     end