Fixed endless processing

Merge in RED/redaction-service from RED-1477 to master

* commit 'bdf40f5e4eec9984306516790eb8c4eb106b0aa1':
  RED-1477: Fixed duplicate images

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -1,7 +1,5 @@
 package buildjob;
 
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
-
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
@@ -24,6 +22,8 @@ import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
 
+import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
+
 /**
  * Plan configuration for Bamboo.
  * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
@@ -33,6 +33,8 @@ public class PlanSpec {
 
     private static final String SERVICE_NAME = "redaction-service";
 
+    private static final String JVM_ARGS =" -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
+
     private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
 
     /**
@@ -72,14 +74,6 @@ public class PlanSpec {
                         .jobs(new Job("Default Job",
                                 new BambooKey("JOB1"))
                                 .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
                                         new ScriptTask()
                                                 .description("Clean")
                                                 .inlineBody("#!/bin/bash\n" +
@@ -90,9 +84,12 @@ public class PlanSpec {
                                                 .checkoutItems(new CheckoutItem().defaultRepository()),
                                         new ScriptTask()
                                                 .description("Build")
+                                                .environmentVariables("MAVEN_OPTS="+JVM_ARGS)
                                                 .inlineBody("#!/bin/bash\n" +
                                                         "set -e\n" +
 
+                                                        "export MAVEN_OPTS=\"$MAVEN_OPTS "+JVM_ARGS +"\"\n" +
+
                                                         "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
                                                         "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml versions:set  -DnewVersion=${bamboo.version_tag}; fi\n" +
 

redaction-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.0.2</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.1.7</version>
+                <version>1.3.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -52,4 +52,4 @@
 
     </dependencyManagement>
 
-</project>
+</project>

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

@@ -5,13 +5,20 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class AnalyzeRequest {
 
-    private byte[] document;
+    private String projectId;
+    private String fileId;
     private String ruleSetId;
+    private boolean reanalyseOnlyIfPossible;
     private ManualRedactions manualRedactions;
+    private OffsetDateTime lastProcessed;
+
 }
+

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

@@ -11,8 +11,19 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AnalyzeResult {
 
+    private String projectId;
+    private String fileId;
+    private long duration;
     private int numberOfPages;
-    private RedactionLog redactionLog;
-    private SectionGrid sectionGrid;
+    private boolean hasHints;
+    private boolean hasRequests;
+    private boolean hasRedactions;
+    private boolean hasImages;
+    private boolean hasUpdates;
+    private long dictionaryVersion;
+    private long dossierDictionaryVersion;
+    private long rulesVersion;
+
 
 }
+

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

@@ -11,7 +11,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class AnnotateRequest {
 
-    private byte[] document;
-    private RedactionLog redactionLog;
-    private SectionGrid sectionGrid;
+    private String projectId;
+    private String fileId;
 }

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

@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ChangeType {
+    ADDED, REMOVED
+}

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

@@ -1,12 +1,12 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.OffsetDateTime;
+
 @Data
 @Builder
 @AllArgsConstructor

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

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualForceRedact {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String legalBasis;
+
+}

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -27,4 +27,6 @@ public class ManualRedactionEntry {
     private String section;
     private int sectionNumber;
 
+    private boolean addToDossierDictionary;
+
 }

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

@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;
 
 public enum ManualRedactionType {
-    ADD, REMOVE
+    ADD, REMOVE, FORCE_REDACT
 }

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

@@ -1,16 +1,16 @@
 package com.iqser.red.service.redaction.v1.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 @Data
 @Builder
 @AllArgsConstructor
@@ -20,6 +20,9 @@ public class ManualRedactions {
     @Builder.Default
     private Set<IdRemoval> idsToRemove = new HashSet<>();
 
+    @Builder.Default
+    private Set<ManualForceRedact> forceRedacts = new HashSet<>();
+
     @Builder.Default
     private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
 

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

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReanalyzeResult {
+
+    private RedactionLog redactionLog;
+}

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

@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RedactionChangeLog {
+
+    private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();
+
+    private long dictionaryVersion = -1;
+    private long rulesVersion = -1;
+
+    private String ruleSetId;
+
+}

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

@@ -0,0 +1,47 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedactionChangeLogEntry {
+
+    private String id;
+    private String type;
+    private String value;
+    private String reason;
+    private int matchedRule;
+    private String legalBasis;
+    private boolean redacted;
+    private boolean isHint;
+    private boolean isRecommendation;
+    private String section;
+    private float[] color;
+
+    @Builder.Default
+    private List<Rectangle> positions = new ArrayList<>();
+    private int sectionNumber;
+    private boolean manual;
+    private Status status;
+    private ManualRedactionType manualRedactionType;
+    private boolean isDictionaryEntry;
+
+    private String textBefore;
+    private String textAfter;
+
+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
+    private ChangeType changeType;
+
+    private boolean isDossierDictionaryEntry;
+
+}

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

@@ -1,13 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
 public class RedactionLog {
 
@@ -17,15 +15,17 @@ public class RedactionLog {
     private long rulesVersion = -1;
 
     private String ruleSetId;
-    private String filename;
+
+    private long dossierDictionaryVersion = -1;
 
 
-    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
+    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId, long dossierDictionaryVersion) {
 
         this.redactionLogEntry = redactionLogEntry;
         this.dictionaryVersion = dictionaryVersion;
         this.rulesVersion = rulesVersion;
         this.ruleSetId = ruleSetId;
+        this.dossierDictionaryVersion = dossierDictionaryVersion;
     }
 
 

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -40,4 +40,11 @@ public class RedactionLogEntry {
     @Builder.Default
     private List<Comment> comments = new ArrayList<>();
 
+    private int startOffset;
+    private int endOffset;
+
+    private boolean isImage;
+
+    private boolean isDossierDictionaryEntry;
+
 }

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

@@ -11,7 +11,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class RedactionRequest {
 
-    private byte[] document;
+    private String projectId;
+    private String fileId;
     private String ruleSetId;
     private ManualRedactions manualRedactions;
 }

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

@@ -13,7 +13,5 @@ public class RedactionResult {
 
     private byte[] document;
     private int numberOfPages;
-    private RedactionLog redactionLog;
-    private SectionGrid sectionGrid;
 
 }

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

@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionArea {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    private int page;
+
+    private String header;
+
+    public boolean contains(Rectangle other) {
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
+    }
+
+}

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;
 
-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/resources/RedactionResource.java

@@ -1,11 +1,6 @@
 package com.iqser.red.service.redaction.v1.resources;
 
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-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.*;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -18,8 +13,6 @@ public interface RedactionResource {
     String RULE_SET_PARAMETER_NAME = "ruleSetId";
     String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
 
-    @PostMapping(value = "/analyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest);
 
     @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);
@@ -33,10 +26,10 @@ public interface RedactionResource {
     @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
 
-    @PostMapping(value = "/rules/update"+RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/rules/update" + RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId);
 
     @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
     void testRules(@RequestBody String rules);
 
-}
+}

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

@@ -12,6 +12,10 @@
     <artifactId>redaction-service-server-v1</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>storage-commons</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>redaction-service-api-v1</artifactId>
@@ -20,7 +24,18 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.0.0</version>
+            <version>2.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>file-management-service-api-v1</artifactId>
+            <version>2.7.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
@@ -73,11 +88,13 @@
             <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>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>2.3.1.RELEASE</version>
         </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -89,6 +106,12 @@
             <artifactId>test-commons</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit-test</artifactId>
+            <version>2.3.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -4,7 +4,6 @@ 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;
@@ -15,12 +14,13 @@ import org.springframework.context.annotation.Import;
 @Import({DefaultWebMvcConfiguration.class})
 @EnableFeignClients(basePackageClasses = RulesClient.class)
 @EnableConfigurationProperties(RedactionServiceSettings.class)
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class, WebMvcMetricsAutoConfiguration.class})
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
 public class Application {
 
     public static void main(String[] args) {
+        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
         SpringApplication.run(Application.class, args);
     }
 
 
-}
+}

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

@@ -1,16 +1,18 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+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.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-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.server.redaction.model.Entity;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.util.Set;
 
 @Data
 @NoArgsConstructor
@@ -18,15 +20,23 @@ public class Document {
 
     private List<Page> pages = new ArrayList<>();
     private List<Paragraph> paragraphs = new ArrayList<>();
+    private List<Header> headers = new ArrayList<>();
+    private List<Footer> footers = new ArrayList<>();
+    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;
 
     private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
     private SectionGrid sectionGrid = new SectionGrid();
-    private long dictionaryVersion;
+    private DictionaryVersion dictionaryVersion;
     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/FloatFrequencyCounter.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -7,38 +9,35 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import lombok.Getter;
-
-public class FloatFrequencyCounter
-{
+public class FloatFrequencyCounter {
 
     @Getter
     Map<Float, Integer> countPerValue = new HashMap<>();
 
-    public void add(float value){
-        if(!countPerValue.containsKey(value)){
+    public void add(float value) {
+        if (!countPerValue.containsKey(value)) {
             countPerValue.put(value, 1);
         } else {
             countPerValue.put(value, countPerValue.get(value) + 1);
         }
     }
 
-    public void addAll(Map<Float, Integer> otherCounter){
-        for(Map.Entry<Float, Integer> entry: otherCounter.entrySet()){
-            if(countPerValue.containsKey(entry.getKey())){
-                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey())+ entry.getValue());
+    public void addAll(Map<Float, Integer> otherCounter) {
+        for (Map.Entry<Float, Integer> entry : otherCounter.entrySet()) {
+            if (countPerValue.containsKey(entry.getKey())) {
+                countPerValue.put(entry.getKey(), countPerValue.get(entry.getKey()) + entry.getValue());
             } else {
                 countPerValue.put(entry.getKey(), entry.getValue());
             }
         }
     }
 
-    public Float getMostPopular(){
+    public Float getMostPopular() {
         Map.Entry<Float, Integer> mostPopular = null;
-        for(Map.Entry<Float, Integer> entry: countPerValue.entrySet()){
-            if(mostPopular == null){
+        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null) {
                 mostPopular = entry;
-            } else if(entry.getValue() >= mostPopular.getValue()){
+            } else if (entry.getValue() >= mostPopular.getValue()) {
                 mostPopular = entry;
             }
         }
@@ -46,12 +45,11 @@ public class FloatFrequencyCounter
     }
 
 
-
-    public List<Float> getHighterThanMostPopular(){
+    public List<Float> getHighterThanMostPopular() {
         Float mostPopular = getMostPopular();
         List<Float> higher = new ArrayList<>();
-        for(Float value: countPerValue.keySet()){
-            if(value > mostPopular){
+        for (Float value : countPerValue.keySet()) {
+            if (value > mostPopular) {
                 higher.add(value);
             }
         }
@@ -60,12 +58,12 @@ public class FloatFrequencyCounter
     }
 
 
-    public Float getHighest(){
+    public Float getHighest() {
         Float highest = null;
-        for(Float value: countPerValue.keySet()){
-            if (highest == null){
+        for (Float value : countPerValue.keySet()) {
+            if (highest == null) {
                 highest = value;
-            } else if(value > highest){
+            } else if (value > highest) {
                 highest = value;
             }
         }

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class Footer {
+
+    private List<TextBlock> textBlocks;
+
+    @JsonIgnore
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class Header {
+
+    private List<TextBlock> textBlocks;
+
+    @JsonIgnore
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}

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

@@ -0,0 +1,6 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+public enum Orientation {
+
+    NONE, LEFT, RIGHT
+}

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

@@ -1,15 +1,14 @@
 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;
-
 import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 @Data
 @RequiredArgsConstructor
 public class Page {
@@ -17,7 +16,7 @@ public class Page {
     @NonNull
     private List<AbstractTextContainer> textBlocks;
 
-    private List<Rectangle2D> imageBounds;
+    private List<PdfImage> images;
 
     private Rectangle bodyTextFrame;
 
@@ -31,8 +30,10 @@ 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

@@ -1,20 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+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;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.ArrayList;
 import java.util.List;
 
-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;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 @Data
 @NoArgsConstructor
-public class Paragraph {
+public class Paragraph implements Comparable {
 
     private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
+    private List<PdfImage> images = new ArrayList<>();
     private String headline;
 
 
@@ -53,4 +54,11 @@ public class Paragraph {
         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/classification/model/SectionText.java

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionText {
+
+    private int sectionNumber;
+    private String text;
+
+    private boolean isTable;
+    private String headline;
+
+    private List<SectionArea> sectionAreas = new ArrayList<>();
+    private Set<Image> images = new HashSet<>();
+
+    private List<TextBlock> textBlocks = new ArrayList<>();
+    private Map<String, CellValue> tabularData = new HashMap<>();
+    private List<Integer> cellStarts = new ArrayList<>();
+
+
+    public void setTabularData(Map<String, CellValue> tabularData) {
+        tabularData.remove(null);
+        this.tabularData = tabularData;
+    }
+
+    @JsonIgnore
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block != null) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}

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

@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import lombok.Getter;
-
 public class StringFrequencyCounter {
 
     @Getter
@@ -46,4 +46,4 @@ public class StringFrequencyCounter {
         return mostPopular != null ? mostPopular.getKey() : null;
     }
 
-}
+}

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

@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Text {
+
+    private int numberOfPages;
+    private List<SectionText> sectionTexts = new ArrayList<>();
+
+}

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

@@ -1,19 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.ArrayList;
 import java.util.List;
 
-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.redaction.utils.TextNormalizationUtilities;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-
 @AllArgsConstructor
 @Builder
 @Data
+@NoArgsConstructor
 public class TextBlock extends AbstractTextContainer {
 
     @Builder.Default
@@ -30,6 +32,7 @@ public class TextBlock extends AbstractTextContainer {
 
     private String classification;
 
+
     public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
         this.minX = minX;
         this.maxX = maxX;
@@ -98,7 +101,6 @@ public class TextBlock extends AbstractTextContainer {
     }
 
 
-
     @Override
     public String toString() {
 
@@ -118,6 +120,7 @@ public class TextBlock extends AbstractTextContainer {
     }
 
     @Override
+    @JsonIgnore
     public String getText() {
 
         StringBuilder sb = new StringBuilder();
@@ -139,4 +142,4 @@ public class TextBlock extends AbstractTextContainer {
 
     }
 
-}
+}

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class UnclassifiedText {
+
+    private List<TextBlock> textBlocks;
+
+    @JsonIgnore
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}

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

@@ -1,15 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 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.Cell;
@@ -17,11 +13,20 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 @Service
 @SuppressWarnings("all")
 public class BlockificationService {
 
-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+    static final float THRESHOLD = 1f;
+
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
+                         List<Ruling> verticalRulingLines) {
 
         List<TextPositionSequence> chunkWords = new ArrayList<>();
         List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -29,21 +34,46 @@ public class BlockificationService {
         float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
         TextPositionSequence prev = null;
 
+        boolean wasSplitted = false;
+        Float splitX1 = null;
         for (TextPositionSequence word : textPositions) {
 
             boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
             boolean startFromTop = word.getY1() > maxY + word.getHeight();
+            boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1();
+            boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1();
+            boolean splittedByRuling = word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || word
+                    .getRotation() == 0 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || word
+                    .getRotation() == 90 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines);
 
-            if (prev != null && (lineSeparation || startFromTop || word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), verticalRulingLines) || word.getRotation() == 0 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(maxX, minY, word
-                    .getX1(), word.getY1(), horizontalRulingLines) || word.getRotation() == 90 && isSplittedByRuling(minX, minY, word
-                    .getX1(), word.getY2(), verticalRulingLines))) {
+            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
+
+                Orientation prevOrientation = null;
+                if(!chunkBlockList1.isEmpty()) {
+                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
+                }
 
                 TextBlock cb1 = buildTextBlock(chunkWords);
                 chunkBlockList1.add(cb1);
                 chunkWords = new ArrayList<>();
 
+                if (splitByX && !splittedByRuling) {
+                    wasSplitted = true;
+                    cb1.setOrientation(Orientation.LEFT);
+                    splitX1 = word.getX1();
+                } else
+
+                if (newLineAfterSplit && !splittedByRuling) {
+                    wasSplitted = false;
+                    cb1.setOrientation(Orientation.RIGHT);
+                    splitX1 = null;
+                } else
+
+                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
+                    cb1.setOrientation(Orientation.LEFT);
+                }
+
                 minX = 1000;
                 maxX = 0;
                 minY = 1000;
@@ -73,9 +103,62 @@ public class BlockificationService {
             chunkBlockList1.add(cb1);
         }
 
+        Iterator<AbstractTextContainer> itty = chunkBlockList1.iterator();
+
+        TextBlock previousLeft = null;
+        TextBlock previousRight = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
+                    previousLeft.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
+                    previousRight.add(block);
+                    itty.remove();
+                    continue;
+                }
+            }
+
+            if (block.getOrientation().equals(Orientation.LEFT)) {
+                previousLeft = block;
+            } else if (block.getOrientation().equals(Orientation.RIGHT)) {
+                previousRight = block;
+            }
+        }
+
+
+        itty = chunkBlockList1.iterator();
+        TextBlock previous = null;
+        while (itty.hasNext()) {
+            TextBlock block = (TextBlock) itty.next();
+
+            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())||
+                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
+                    .getMaxY())){
+                previous.add(block);
+                itty.remove();
+                continue;
+            }
+
+            previous = block;
+        }
+
+
         return new Page(chunkBlockList1);
     }
 
+    private boolean equalsWithThreshold(float f1, float f2){
+        return Math.abs(f1 - f2) < THRESHOLD;
+    }
+
 
     private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {
 
@@ -118,7 +201,8 @@ public class BlockificationService {
     }
 
 
-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines) {
+    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1,
+                                       List<Ruling> rulingLines) {
 
         for (Ruling ruling : rulingLines) {
             if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
@@ -129,7 +213,8 @@ public class BlockificationService {
     }
 
 
-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter,
+                                            boolean landscape) {
 
         float minX = 10000;
         float maxX = -100;

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

@@ -1,19 +1,17 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;
 
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.springframework.stereotype.Service;
-
 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.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.regex.Pattern;
 
 @Slf4j
 @Service
@@ -111,6 +109,8 @@ public class ClassificationService {
             textBlock.setClassification("TextBlock Italic");
         } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
             textBlock.setClassification("TextBlock Unknown");
+        } else {
+            textBlock.setClassification("Other");
         }
     }
 

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

@@ -2,7 +2,6 @@ package com.iqser.red.service.redaction.v1.server.classification.utils;
 
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
-
 import lombok.experimental.UtilityClass;
 
 @UtilityClass

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

@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+
+import com.iqser.red.service.file.management.v1.api.resources.FileStatusProcessingUpdateResource;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${file-management-service.url}")
+public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
+}

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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,102 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+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;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+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, "", null, content);
+    }
+
+
+    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
+
+        this(name, "", null, 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 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/client/RulesClient.java

@@ -3,6 +3,6 @@ package com.iqser.red.service.redaction.v1.server.client;
 import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
+@FeignClient(name = "RulesResource", url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
-}
+}

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

@@ -1,17 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.time.OffsetDateTime;
-
 import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-
-import lombok.extern.slf4j.Slf4j;
+import java.time.OffsetDateTime;
 
 @Slf4j
 @RestControllerAdvice
@@ -38,4 +36,4 @@ public class ControllerAdvice {
         return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
     }
 
-}
+}

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

@@ -1,14 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.file.management.v1.api.model.FileType;
 import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
 import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.resources.RedactionResource;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -16,23 +12,21 @@ import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
 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.RedactionLogCreatorService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.List;
 
 @Slf4j
 @RestController
@@ -40,51 +34,24 @@ import java.util.List;
 public class RedactionController implements RedactionResource {
 
     private final PdfVisualisationService pdfVisualisationService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final RedactionLogCreatorService redactionLogCreatorService;
-    private final EntityRedactionService entityRedactionService;
     private final DroolsExecutionService droolsExecutionService;
     private final DictionaryService dictionaryService;
     private final AnnotationService annotationService;
-
-
-    @Override
-    public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-
-            log.info("Document structure analysis successful, starting redaction analysis...");
-
-            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
-            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
-                    .getRuleSetId());
-
-            log.info("Redaction analysis successful...");
-
-            return AnalyzeResult.builder()
-                    .sectionGrid(classifiedDoc.getSectionGrid())
-                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
-                    .getRulesVersion(), analyzeRequest.getRuleSetId()))
-                    .numberOfPages(classifiedDoc.getPages().size())
-                    .build();
-
-        } catch (Exception e) {
-            throw new RedactionException(e);
-        }
-
-    }
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionStorageService redactionStorageService;
 
 
     public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
 
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getProjectId(), annotateRequest.getFileId(), FileType.ORIGIN));
+        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getProjectId(), annotateRequest.getFileId());
+        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getProjectId(), annotateRequest.getFileId());
 
+        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
             pdDocument.setAllSecurityToBeRemoved(true);
-            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
-            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());
+
+            dictionaryService.updateDictionary(redactionLog.getRuleSetId(), annotateRequest.getProjectId());
+            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
 
             try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                 pdDocument.save(byteArrayOutputStream);
@@ -98,65 +65,80 @@ public class RedactionController implements RedactionResource {
 
 
     @Override
-    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
+    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        try {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
+                pdDocument.setAllSecurityToBeRemoved(true);
 
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
+                pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
 
-            return convert(pdDocument, classifiedDoc.getPages().size(), pdfSegmentationRequest.getRuleSetId());
+                return convert(pdDocument, classifiedDoc.getPages().size());
+
+            } catch (IOException e) {
+                throw new RedactionException(e);
+            }
 
         } catch (IOException e) {
             throw new RedactionException(e);
         }
 
+
     }
 
-
     @Override
     public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        try {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
 
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
+                pdDocument.setAllSecurityToBeRemoved(true);
 
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
+                pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
+                return convert(pdDocument, classifiedDoc.getPages().size());
 
-            return convert(pdDocument, classifiedDoc.getPages().size(), redactionRequest.getRuleSetId());
+            } catch (IOException e) {
+                throw new RedactionException(e);
+            }
 
         } catch (IOException e) {
             throw new RedactionException(e);
         }
 
+
     }
 
 
     @Override
     public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {
 
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
+        Document classifiedDoc;
 
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-
-            StringBuilder sb = new StringBuilder();
-            for (Page page : classifiedDoc.getPages()) {
-                for (AbstractTextContainer textContainer : page.getTextBlocks()) {
-                    if (textContainer instanceof Table) {
-                        Table table = (Table) textContainer;
-                        sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
-                    }
-                }
-            }
-
-            return RedactionResult.builder().document(sb.toString().getBytes()).build();
-
-        } catch (IOException e) {
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getProjectId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
+        } catch (Exception e) {
             throw new RedactionException(e);
         }
 
+
+        StringBuilder sb = new StringBuilder();
+        for (Page page : classifiedDoc.getPages()) {
+            for (AbstractTextContainer textContainer : page.getTextBlocks()) {
+                if (textContainer instanceof Table) {
+                    Table table = (Table) textContainer;
+                    sb.append(table.getTextAsHtml()).append("<br />").append("<br />");
+                }
+            }
+        }
+
+        return RedactionResult.builder().document(sb.toString().getBytes()).build();
+
     }
 
 
@@ -174,26 +156,17 @@ public class RedactionController implements RedactionResource {
     }
 
 
-    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {
-
-        return convert(document, numberOfPages, null, null, 0, 0, ruleSetId);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities, SectionGrid sectionGrid,
-                                    long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {
+    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
 
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
             document.save(byteArrayOutputStream);
             return RedactionResult.builder()
                     .document(byteArrayOutputStream.toByteArray())
                     .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
-                    .sectionGrid(sectionGrid)
                     .build();
         }
 
     }
 
+
 }

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

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.memory;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+
+@Slf4j
+public class MemoryStats {
+
+
+    public static void printMemoryStats() {
+        log.info("\n\n ------------------------------ \n" +
+                " Used Memory: " + humanReadableByteCountBin(getUsedMemory()) + "\n" +
+                " Free Memory: " + humanReadableByteCountBin(getFreeMemory()) + "\n" +
+                " Total Memory: " + humanReadableByteCountBin(getTotalMemory()) + "\n" +
+                " Max Memory: " + humanReadableByteCountBin(getMaxMemory()) + "\n" +
+                "\n ------------------------------ \n");
+    }
+
+
+    public static String humanReadableByteCountBin(long bytes) {
+        long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
+        if (absB < 1024) {
+            return bytes + " B";
+        }
+        long value = absB;
+        CharacterIterator ci = new StringCharacterIterator("KMGTPE");
+        for (int i = 40; i >= 0 && absB > 0xfffccccccccccccL >> i; i -= 10) {
+            value >>= 10;
+            ci.next();
+        }
+        value *= Long.signum(bytes);
+        return String.format("%.1f %ciB", value / 1024.0, ci.current());
+    }
+
+    private static long getMaxMemory() {
+        return Runtime.getRuntime().maxMemory();
+    }
+
+    private static long getUsedMemory() {
+        return getMaxMemory() - getFreeMemory();
+    }
+
+    private static long getTotalMemory() {
+        return Runtime.getRuntime().totalMemory();
+    }
+
+    private static long getFreeMemory() {
+        return Runtime.getRuntime().freeMemory();
+    }
+}

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

@@ -0,0 +1,92 @@
+package com.iqser.red.service.redaction.v1.server.parsing;
+
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PDFAreaTextStripper extends PDFTextStripperByArea {
+
+    @Getter
+    private List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+
+    @Setter
+    private int pageNumber;
+
+    public PDFAreaTextStripper() throws IOException {
+
+    }
+
+    @Override
+    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
+
+        int startIndex = 0;
+        for (int i = 0; i <= textPositions.size() - 1; i++) {
+
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
+                startIndex++;
+                continue;
+            }
+
+            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
+            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i + 1;
+            }
+        }
+
+        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+            sublist = sublist.subList(0, sublist.size() - 1);
+        }
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
+                .getUnicode()
+                .equals("\u00A0")))) {
+            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+        }
+        super.writeString(text);
+    }
+
+
+    public void clearPositions() {
+        textPositionSequences = new ArrayList<>();
+    }
+
+}

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

@@ -1,33 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.parsing;
 
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
+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;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
-import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
-import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
-import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
-import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
-import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
-import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
-import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
-import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
-import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
+import org.apache.pdfbox.contentstream.operator.color.*;
+import org.apache.pdfbox.contentstream.operator.state.*;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -40,32 +23,33 @@ import org.apache.pdfbox.text.PDFTextStripper;
 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.tableextraction.model.Ruling;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
 
-    @Setter
-    protected PDPage pdpage;
-
-    @Getter
-    private int minCharWidths;
-
     @Getter
     private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
-
     @Getter
     private final List<Ruling> rulings = new ArrayList<>();
-
     private final List<Ruling> graphicsPath = new ArrayList<>();
-
+    @Setter
+    protected PDPage pdpage;
     @Getter
-    private List<Rectangle2D> imageBounds = new ArrayList<>();
+    private int minCharWidth;
+    @Getter
+    private int maxCharWidth;
+    @Getter
+    private int minCharHeight;
+    @Getter
+    private int maxCharHeight;
+    @Getter
+    private List<PdfImage> images = new ArrayList<>();
 
     private float path_x;
     private float path_y;
@@ -212,8 +196,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
                         .getWidth(), (float) imageBounds.getHeight());
 
+                // Memory Hack - sofReference kills me
+                FieldUtils.writeField(pdfImage, "cachedImageSubsampling", -1, true);
+
                 if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.imageBounds.add(rect);
+                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
                 }
             }
         } catch (Exception e) {
@@ -280,8 +267,19 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         for (int i = 0; i <= textPositions.size() - 1; i++) {
 
             int charWidth = (int) textPositions.get(i).getWidthDirAdj();
-            if (charWidth < minCharWidths) {
-                minCharWidths = charWidth;
+            if (charWidth < minCharWidth) {
+                minCharWidth = charWidth;
+            }
+            if (charWidth > maxCharWidth) {
+                maxCharWidth = charWidth;
+            }
+
+            int charHeight = (int) textPositions.get(i).getHeightDir();
+            if (charHeight < minCharHeight) {
+                minCharHeight = charHeight;
+            }
+            if (charWidth > maxCharHeight) {
+                maxCharHeight = charHeight;
             }
 
             if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
@@ -302,6 +300,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                 startIndex = i;
             }
 
+
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+                List<TextPosition> sublist = textPositions.subList(startIndex, i);
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                }
+                startIndex = i;
+            }
+
+
             if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                     .getUnicode()
                     .equals("\u00A0")) && i <= textPositions.size() - 2) {
@@ -333,9 +343,12 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     @Override
     public String getText(PDDocument doc) throws IOException {
 
-        minCharWidths = Integer.MAX_VALUE;
+        minCharWidth = Integer.MAX_VALUE;
+        maxCharWidth = 0;
+        minCharHeight = Integer.MAX_VALUE;
+        maxCharHeight = 0;
         textPositionSequences.clear();
-        imageBounds = new ArrayList<>();
+        images = new ArrayList<>();
         rulings.clear();
         graphicsPath.clear();
         path_x = 0.0f;
@@ -345,4 +358,4 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
     }
 
-}
+}

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

@@ -1,23 +0,0 @@
-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;
-}

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

@@ -0,0 +1,52 @@
+package com.iqser.red.service.redaction.v1.server.parsing.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.beans.BeanUtils;
+
+@Data
+@NoArgsConstructor
+public class RedTextPosition {
+
+    private String textMatrix;
+    private int rotation;
+    private float y;
+    private float pageHeight;
+    private float pageWidth;
+    private String unicode;
+    private float XDirAdj;
+    private float YDirAdj;
+    private float width;
+    private float heightDir;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private float widthOfSpace;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private float fontSizeInPt;
+
+    // not used in reanalysis
+    @JsonIgnore
+    private String fontName;
+
+
+    @SneakyThrows
+    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
+        var pos = new RedTextPosition();
+        BeanUtils.copyProperties(textPosition, pos);
+        pos.setFontName(textPosition.getFont().getName());
+
+        pos.setFontSizeInPt(textPosition.getFontSizeInPt());
+
+        pos.setTextMatrix(textPosition.getTextMatrix().toString());
+
+        return pos;
+    }
+
+
+}

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

@@ -1,32 +1,52 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.pdfbox.text.TextPosition;
+
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.pdfbox.text.TextPosition;
-
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
+import java.util.stream.Collectors;
 
 @Data
-@RequiredArgsConstructor
+@NoArgsConstructor
+@JsonIgnoreProperties({ "empty" })
 public class TextPositionSequence implements CharSequence {
 
-    private List<TextPosition> textPositions = new ArrayList<>();
+    private int page;
+    private List<RedTextPosition> textPositions = new ArrayList<>();
 
-    private final int page;
+    private float x1;
+    private float x2;
+
+    public TextPositionSequence(int page) {
+        this.page = page;
+    }
+
+
+    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
+        var textPositionSequence = new TextPositionSequence();
+        textPositionSequence.textPositions = textPositions;
+        textPositionSequence.page = page;
+
+        return textPositionSequence;
+    }
 
 
     public TextPositionSequence(List<TextPosition> textPositions, int page) {
 
-        this.textPositions = textPositions;
+        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
         this.page = page;
     }
 
 
+
+
+
     @Override
     public int length() {
 
@@ -37,7 +57,7 @@ public class TextPositionSequence implements CharSequence {
     @Override
     public char charAt(int index) {
 
-        TextPosition textPosition = textPositionAt(index);
+        RedTextPosition textPosition = textPositionAt(index);
         String text = textPosition.getUnicode();
         return text.charAt(0);
     }
@@ -45,7 +65,7 @@ public class TextPositionSequence implements CharSequence {
 
     public char charAt(int index, boolean caseInSensitive) {
 
-        TextPosition textPosition = textPositionAt(index);
+        RedTextPosition textPosition = textPositionAt(index);
         String text = textPosition.getUnicode();
         return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
     }
@@ -54,7 +74,7 @@ public class TextPositionSequence implements CharSequence {
     @Override
     public TextPositionSequence subSequence(int start, int end) {
 
-        return new TextPositionSequence(textPositions.subList(start, end), page);
+        return fromData(textPositions.subList(start, end), page);
     }
 
 
@@ -69,18 +89,25 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
-    public TextPosition textPositionAt(int index) {
+    public RedTextPosition textPositionAt(int index) {
 
         return textPositions.get(index);
     }
 
 
-    public void add(TextPosition textPosition) {
+    public void add(RedTextPosition textPosition) {
 
         this.textPositions.add(textPosition);
     }
 
 
+    public void add(TextPosition textPosition) {
+
+        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
+    }
+
+
+    @JsonIgnore
     public float getX1() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -91,6 +118,7 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
+    @JsonIgnore
     public float getX2() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -101,10 +129,14 @@ public class TextPositionSequence implements CharSequence {
         }
     }
 
+    @JsonIgnore
     public float getRotationAdjustedY() {
+
         return textPositions.get(0).getY();
     }
 
+
+    @JsonIgnore
     public float getY1() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -115,6 +147,7 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
+    @JsonIgnore
     public float getY2() {
 
         if (textPositions.get(0).getRotation() == 90) {
@@ -125,38 +158,40 @@ public class TextPositionSequence implements CharSequence {
     }
 
 
+    @JsonIgnore
     public float getTextHeight() {
 
         return textPositions.get(0).getHeightDir() + 2;
     }
 
 
+    @JsonIgnore
     public float getHeight() {
 
         return getY2() - getY1();
     }
 
 
+    @JsonIgnore
     public float getWidth() {
 
         return getX2() - getX1();
     }
 
 
+    @JsonIgnore
     public String getFont() {
-
-        return textPositions.get(0)
-                .getFont()
-                .toString()
+        return textPositions.get(0).getFontName()
                 .toLowerCase()
                 .replaceAll(",bold", "")
                 .replaceAll(",italic", "");
     }
 
 
+    @JsonIgnore
     public String getFontStyle() {
 
-        String lowercaseFontName = textPositions.get(0).getFont().toString().toLowerCase();
+        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
 
         if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
             return "bold, italic";
@@ -170,25 +205,25 @@ public class TextPositionSequence implements CharSequence {
 
     }
 
-
+    @JsonIgnore
     public float getFontSize() {
 
         return textPositions.get(0).getFontSizeInPt();
     }
 
-
+    @JsonIgnore
     public float getSpaceWidth() {
 
         return textPositions.get(0).getWidthOfSpace();
     }
 
-
+    @JsonIgnore
     public int getRotation() {
 
         return textPositions.get(0).getRotation();
     }
 
-
+    @JsonIgnore
     public Rectangle getRectangle() {
 
         float height = getTextHeight();
@@ -202,6 +237,13 @@ 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;
@@ -213,5 +255,4 @@ 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/queue/MessagingConfiguration.java

@@ -0,0 +1,35 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.core.QueueBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RequiredArgsConstructor
+public class MessagingConfiguration {
+
+
+    public static final String REDACTION_QUEUE = "redactionQueue";
+
+    public static final String REDACTION_DQL = "redactionDQL";
+
+
+    @Bean
+    public Queue redactionQueue() {
+
+        return QueueBuilder.durable(REDACTION_QUEUE)
+                .withArgument("x-dead-letter-exchange", "")
+                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
+                .maxPriority(2)
+                .build();
+    }
+
+
+    @Bean
+    public Queue redactionDeadLetterQueue() {
+
+        return QueueBuilder.durable(REDACTION_DQL).build();
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.iqser.red.service.redaction.v1.server.queue;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionMessageReceiver {
+
+    private final ObjectMapper objectMapper;
+    private final ReanalyzeService reanalyzeService;
+    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_QUEUE)
+    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
+
+        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
+        log.info("Processing analyze request: {}", analyzeRequest);
+        AnalyzeResult result;
+        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
+            result = reanalyzeService.reanalyze(analyzeRequest);
+        } else {
+            result = reanalyzeService.analyze(analyzeRequest);
+        }
+        log.info("Successfully analyzed {}", analyzeRequest);
+
+        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), result);
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = REDACTION_DQL)
+    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
+
+        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
+        log.info("Failed to process analyze request: {}", analyzeRequest);
+
+        fileStatusProcessingUpdateClient.analysisFailed(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
+    }
+
+}

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

@@ -1,22 +1,25 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import java.util.Iterator;
-import java.util.List;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import lombok.Value;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
-@Value
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class CellValue {
 
-    private List<TextBlock> textBlocks;
+    private List<TextBlock> textBlocks = new ArrayList<>();
 
     private int rowSpanStart;
 
-
     @Override
     public String toString() {
 
@@ -47,4 +50,4 @@ public class CellValue {
                 .replaceAll(" {2}", " ");
     }
 
-}
+}

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

@@ -1,13 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import lombok.Data;
+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import lombok.Data;
-import lombok.Getter;
-
 @Data
 public class Dictionary {
 
@@ -18,18 +18,18 @@ public class Dictionary {
     private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
 
     @Getter
-    private long version;
+    private DictionaryVersion version;
 
 
-    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+    public Dictionary(List<DictionaryModel> dictionaryModels, DictionaryVersion version) {
         this.dictionaryModels = dictionaryModels;
         this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
-        this.version = dictionaryVersion;
+        this.version = version;
     }
 
 
-    public int getDictionaryRank(String type){
-        if(!localAccessMap.containsKey(type)){
+    public int getDictionaryRank(String type) {
+        if (!localAccessMap.containsKey(type)) {
             return 0;
         }
         return localAccessMap.get(type).getRank();
@@ -60,7 +60,7 @@ public class Dictionary {
 
     public boolean containsValue(String type, String value) {
 
-        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+        return localAccessMap.containsKey(type) && localAccessMap.get(type)
                 .getEntries()
                 .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
                 .getLocalEntries()
@@ -68,10 +68,7 @@ public class Dictionary {
                 .getEntries()
                 .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
                 .getLocalEntries()
-                .contains(value)) {
-            return true;
-        }
-        return false;
+                .contains(value);
     }
 
 

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

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+public class DictionaryIncrement {
+
+    private Set<DictionaryIncrementValue> values;
+    private DictionaryVersion dictionaryVersion;
+
+}

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

@@ -0,0 +1,13 @@
+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

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

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

@@ -20,5 +20,4 @@ public class DictionaryRepresentation {
     private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
 
 
-
 }

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

@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DictionaryVersion {
+
+    long rulesetVersion;
+    long dossierVersion;
+}

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

@@ -1,13 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 @Data
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity {
@@ -38,8 +37,10 @@ public class Entity {
     private String textBefore;
     private String textAfter;
 
+    private boolean isDossierDictionaryEntry;
 
-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter) {
+
+    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end, boolean isDossierDictionaryEntry) {
 
         this.word = word;
         this.type = type;
@@ -53,10 +54,13 @@ public class Entity {
         this.isDictionaryEntry = isDictionaryEntry;
         this.textBefore = textBefore;
         this.textAfter = textAfter;
+        this.start = start;
+        this.end = end;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
     }
 
 
-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionaryEntry) {
 
         this.word = word;
         this.type = type;
@@ -65,6 +69,7 @@ public class Entity {
         this.headline = headline;
         this.sectionNumber = sectionNumber;
         this.isDictionaryEntry = isDictionaryEntry;
+        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
     }
 
 }

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

@@ -1,24 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @RequiredArgsConstructor
 @AllArgsConstructor
 @EqualsAndHashCode
 public class EntityPositionSequence {
 
+    private final String id;
     @EqualsAndHashCode.Exclude
     private List<TextPositionSequence> sequences = new ArrayList<>();
     private int pageNumber;
-    private final String id;
 
 }

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Image {
+
+    private String type;
+    private RedRectangle2D 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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,31 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+
+@Data
+@RequiredArgsConstructor
+public class PdfImage {
+
+    @JsonIgnore
+    private BufferedImage image;
+    @NonNull
+    private RedRectangle2D position;
+    private ImageType imageType;
+    private boolean isAppendedToParagraph;
+
+    @NonNull
+    private int page;
+
+    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
+        this.image = image;
+        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
+        this.page = page;
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedRectangle2D {
+
+    private double x;
+    private double y;
+    private double width;
+    private double height;
+
+    @JsonIgnore
+    public boolean isEmpty() {
+        return width <= 0.0f || height <= 0.0f;
+    }
+
+    public boolean contains(double x, double y, double w, double h) {
+        if (isEmpty() || w <= 0 || h <= 0) {
+            return false;
+        }
+        double x0 = getX();
+        double y0 = getY();
+        return x >= x0 &&
+                y >= y0 &&
+                (x + w) <= x0 + getWidth() &&
+                (y + h) <= y0 + getHeight();
+    }
+}

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

@@ -1,14 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
 public class SearchableText {
 
     private final List<TextPositionSequence> sequences = new ArrayList<>();
@@ -32,6 +32,7 @@ public class SearchableText {
 
     }
 
+
     @SuppressWarnings("checkstyle:ModifiedControlVariable")
     public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive,
                                                      List<TextPositionSequence> sequencesSubList) {
@@ -66,9 +67,12 @@ public class SearchableText {
             for (int j = 0; j < searchSpace.get(i).length(); j++) {
 
                 if (i > 0 && j == 0 && searchSpace.get(i).charAt(0, caseInsensitive) == ' ' && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
-                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i).charAt(j - 1, caseInsensitive) == ' ') {
-                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) {
+                        .charAt(searchSpace.get(i - 1)
+                                .length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
+                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
+                        .charAt(j - 1, caseInsensitive) == ' ') {
+                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions()
+                            .isEmpty()) {
                         crossSequenceParts.add(partMatch);
                     }
                     continue;
@@ -80,8 +84,8 @@ public class SearchableText {
                     counter++;
                 }
 
-                if (searchSpace.get(i)
-                        .charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace.get(i)
+                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace
+                        .get(i)
                         .charAt(j, caseInsensitive) == '-') {
 
                     if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(searchSpace.get(i)
@@ -100,14 +104,15 @@ public class SearchableText {
                     if (counter == searchString.length()) {
                         crossSequenceParts.add(partMatch);
 
-                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i).length() - 1 || j != searchSpace.get(i)
-                                .length() - 1 && isSeparator(searchSpace.get(i)
+                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
+                                .length() - 1 || j != searchSpace.get(i).length() - 1 && isSeparator(searchSpace.get(i)
                                 .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
                                 .length() - 1 && isSeparator(searchSpace.get(i + 1)
-                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
+                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
+                                .length() - 1 && searchSpace.get(i)
                                 .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
                                 .charAt(0, caseInsensitive) != ' ') {
-                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts));
+                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts, normalizedSearchString));
                         }
 
                         counter = 0;
@@ -130,15 +135,21 @@ public class SearchableText {
         }
 
         return finalMatches;
-
     }
 
 
-    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts) {
+    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts,
+                                                                     String searchString) {
+
+        List<EntityPositionSequence> result = new ArrayList<>();
+        String asString = buildString(crossSequenceParts);
+        if (!asString.equalsIgnoreCase(searchString)) {
+            return result;
+        }
 
         String plainId = IdBuilder.buildId(crossSequenceParts);
         String id = plainId;
-        List<EntityPositionSequence> result = new ArrayList<>();
+
         int currentPage = -1;
         int idDiffentPageSuffix = 1;
         EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
@@ -173,6 +184,12 @@ public class SearchableText {
     @Override
     public String toString() {
 
+        return buildString(sequences);
+    }
+
+
+    public String buildString(List<TextPositionSequence> sequences) {
+
         StringBuilder sb = new StringBuilder();
 
         TextPositionSequence previous = null;
@@ -215,4 +232,4 @@ public class SearchableText {
         return sb.append("\n").toString();
     }
 
-}
+}

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

@@ -1,6 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;
 
-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -11,15 +17,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.StringUtils;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
 
 @Data
 @Slf4j
@@ -51,6 +49,9 @@ public class Section {
 
     private SearchableText searchableText;
 
+    @Builder.Default
+    private Set<Image> images = new HashSet<>();
+
 
     public boolean rowEquals(String headerName, String value) {
 
@@ -75,6 +76,12 @@ 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);
@@ -109,6 +116,19 @@ 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);
@@ -125,6 +145,18 @@ 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);
@@ -140,6 +172,49 @@ public class Section {
     }
 
 
+    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
+                                              String asType) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {
+
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                String match = matcher.group(group);
+                if (StringUtils.isNotBlank(match)) {
+                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null));
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+    }
+
+
+    public void addHintAnnotationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
+    }
+
+
     public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {
 
         entities.forEach(entity -> {
@@ -156,7 +231,14 @@ public class Section {
     public void addHintAnnotation(String value, String asType) {
 
         Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+    }
+
+
+    public void addRedaction(String value, String asType, int ruleNumber, String reason, String legalBasis) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
     }
 
 
@@ -329,7 +411,7 @@ public class Section {
         String text = caseInsensitive ? searchText.toLowerCase() : searchText;
         String searchValue = caseInsensitive ? value.toLowerCase() : value;
 
-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true);
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true, false);
 
         found.forEach(entity -> {
             if (redacted) {
@@ -355,7 +437,7 @@ public class Section {
         } else {
             String word = value.toString();
 
-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false);
             entity.setRedaction(redact);
             entity.setMatchedRule(ruleNumber);
             entity.setRedactionReason(reason);

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

@@ -0,0 +1,48 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AnalyzeResponseService {
+
+    public AnalyzeResult createAnalyzeResponse(String projectId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
+        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(RedactionLogEntry::isHint);
+
+        boolean hasRequests = redactionLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> entry.isManual() && entry.getStatus()
+                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
+
+        boolean hasRedactions = redactionLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
+                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
+
+        boolean hasImages = redactionLog.getRedactionLogEntry()
+                .stream()
+                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image"));
+
+        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
+                .getRedactionLogEntry()
+                .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive"));
+
+        return AnalyzeResult.builder()
+                .projectId(projectId)
+                .fileId(fileId)
+                .duration(duration)
+                .numberOfPages(pageCount)
+                .hasHints(hasHints)
+                .hasRedactions(hasRedactions)
+                .hasRequests(hasRequests)
+                .hasImages(hasImages)
+                .hasUpdates(hasUpdates)
+                .rulesVersion(redactionLog.getRulesVersion())
+                .dictionaryVersion(redactionLog.getDictionaryVersion())
+                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
+                .build();
+    }
+}

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

@@ -1,14 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.awt.Color;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.iqser.red.service.redaction.v1.model.*;
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -21,15 +14,14 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.model.CellRectangle;
-import com.iqser.red.service.redaction.v1.model.Comment;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionGrid;
-import com.iqser.red.service.redaction.v1.model.SectionRectangle;
-
-import lombok.RequiredArgsConstructor;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor

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

@@ -1,12 +1,19 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
+import static com.iqser.red.service.configuration.v1.api.resource.DictionaryResource.GLOBAL_DOSSIER;
+
 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 com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -15,13 +22,7 @@ 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.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -29,41 +30,74 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DictionaryService {
 
-
     private final DictionaryClient dictionaryClient;
 
-
-    private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();
+    private final Map<String, DictionaryRepresentation> dictionariesByDossier = new HashMap<>();
 
 
-    public void updateDictionary(String ruleSetId) {
+    public DictionaryVersion updateDictionary(String ruleSetId, String dossierId) {
 
-        long version = dictionaryClient.getVersion(ruleSetId);
-
-        var foundDictionary = dictionariesByRuleSets.get(ruleSetId);
-
-        if (foundDictionary == null || version > foundDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(ruleSetId, version);
+        long rulesetDictionaryVersion = dictionaryClient.getVersion(ruleSetId, GLOBAL_DOSSIER);
+        var rulesetDictionary = dictionariesByRuleSets.get(ruleSetId);
+        if (rulesetDictionary == null || rulesetDictionaryVersion > rulesetDictionary.getDictionaryVersion()) {
+            updateDictionaryEntry(ruleSetId, rulesetDictionaryVersion, GLOBAL_DOSSIER);
         }
+
+        long dossierDictionaryVersion = dictionaryClient.getVersion(ruleSetId, dossierId);
+        var dossierDictionary = dictionariesByDossier.get(dossierId);
+        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
+            updateDictionaryEntry(ruleSetId, dossierDictionaryVersion, dossierId);
+        }
+
+        return DictionaryVersion.builder().rulesetVersion(rulesetDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
     }
 
 
-    private void updateDictionaryEntry(String ruleSetId, long version) {
+    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, DictionaryVersion fromVersion, String dossierId) {
+
+        DictionaryVersion version = updateDictionary(ruleSetId, dossierId);
+
+        Set<DictionaryIncrementValue> newValues = new HashSet<>();
+        List<DictionaryModel> dictionaryModels = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        dictionaryModels.forEach(dictionaryModel -> {
+            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
+                if (dictionaryEntry.getVersion() > fromVersion.getRulesetVersion()) {
+                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                }
+            });
+        });
+
+        if(dictionariesByDossier.containsKey(dossierId)) {
+            dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
+            dictionaryModels.forEach(dictionaryModel -> {
+                dictionaryModel.getEntries().forEach(dictionaryEntry -> {
+                    if (dictionaryEntry.getVersion() > fromVersion.getDossierVersion()) {
+                        newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                    }
+                });
+            });
+        }
+
+        return new DictionaryIncrement(newValues, version);
+    }
+
+
+    private void updateDictionaryEntry(String ruleSetId, long version, String dossierId) {
 
         try {
             DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();
 
-            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId);
+            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId, dossierId);
             if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
 
                 List<DictionaryModel> dictionary = typeResponse.getTypes()
                         .stream()
                         .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(),dossierId.equals(GLOBAL_DOSSIER) ? false : true))
                         .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                         .collect(Collectors.toList());
 
-
                 dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));
 
                 Colors colors = dictionaryClient.getColors(ruleSetId);
@@ -76,7 +110,11 @@ public class DictionaryService {
                 dictionaryRepresentation.setDictionaryVersion(version);
                 dictionaryRepresentation.setDictionary(dictionary);
 
-                dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
+                if(dossierId.equals(GLOBAL_DOSSIER)) {
+                    dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
+                } else {
+                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
+                }
             }
         } catch (FeignException e) {
             log.warn("Got some unknown feignException", e);
@@ -86,29 +124,28 @@ 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);
-                long externalVersion = dictionaryClient.getVersion(ruleSetId);
-                if (externalVersion == dictionary.getVersion() + 1) {
-                    dictionary.setVersion(externalVersion);
+                dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false, GLOBAL_DOSSIER);
+                long externalVersion = dictionaryClient.getVersion(ruleSetId, GLOBAL_DOSSIER);
+                if (externalVersion == dictionary.getVersion().getRulesetVersion() + 1) {
+                    dictionary.getVersion().setRulesetVersion(externalVersion);
                 }
             }
         });
     }
 
 
-    private Set<String> convertEntries(TypeResult t) {
+    private Set<DictionaryEntry> convertEntries(TypeResult t, String dossierId) {
+
+        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId(), dossierId)
+                .getEntries());
 
         if (t.isCaseInsensitive()) {
-            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());
+            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
         }
+        return entries;
     }
 
 
@@ -148,6 +185,7 @@ public class DictionaryService {
         return false;
     }
 
+
     public boolean isRecommendation(String type, String ruleSetId) {
 
         DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
@@ -158,27 +196,44 @@ public class DictionaryService {
     }
 
 
-    public Dictionary getDeepCopyDictionary(String ruleSetId) {
+    public Dictionary getDeepCopyDictionary(String ruleSetId, String dossierId) {
+
         List<DictionaryModel> copy = new ArrayList<>();
 
-        var representation = dictionariesByRuleSets.get(ruleSetId);
-        var dictionary = dictionariesByRuleSets.get(ruleSetId).getDictionary();
-        dictionary.forEach(dm -> {
+        var rulesetRepresentation = dictionariesByRuleSets.get(ruleSetId);
+        rulesetRepresentation.getDictionary().forEach(dm -> {
             copy.add(SerializationUtils.clone(dm));
         });
 
-        return new Dictionary(copy, representation.getDictionaryVersion());
+        //TODO merge dictionaries if they have same names
+        long dossierDictionaryVersion = -1;
+        if(dictionariesByDossier.containsKey(dossierId)) {
+            var dossierRepresentation = dictionariesByDossier.get(dossierId);
+            dossierRepresentation.getDictionary().forEach(dm -> {
+                copy.add(SerializationUtils.clone(dm));
+            });
+            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
+        }
+
+        return new Dictionary(copy, DictionaryVersion.builder().rulesetVersion(rulesetRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
     }
 
+
     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/DroolsExecutionService.java

@@ -1,11 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
@@ -15,12 +14,11 @@ import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
-
-import lombok.RequiredArgsConstructor;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -28,9 +26,9 @@ public class DroolsExecutionService {
 
     private final RulesClient rulesClient;
 
-    private Map<String, KieContainer> kieContainers = new HashMap<>();
+    private final Map<String, KieContainer> kieContainers = new HashMap<>();
 
-    private Map<String, Long> rulesVersionPerRuleSetId = new HashMap<>();
+    private final Map<String, Long> rulesVersionPerRuleSetId = new HashMap<>();
 
 
     public KieContainer getKieContainer(String ruleSetId) {
@@ -133,4 +131,4 @@ public class DroolsExecutionService {
         return rulesVersion.longValue();
     }
 
-}
+}

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

@@ -1,40 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+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.server.classification.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+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;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-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.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.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;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Slf4j
 @Service
@@ -46,13 +33,13 @@ public class EntityRedactionService {
     private final SurroundingWordsService surroundingWordsService;
 
 
-    public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions) {
+    public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions, String dossierId) {
 
-        dictionaryService.updateDictionary(ruleSetId);
+        dictionaryService.updateDictionary(ruleSetId, dossierId);
         KieContainer container = droolsExecutionService.updateRules(ruleSetId);
         long rulesVersion = droolsExecutionService.getRulesVersion(ruleSetId);
 
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId);
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId, dossierId);
 
         Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));
 
@@ -60,7 +47,7 @@ public class EntityRedactionService {
 
             Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
             documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType())) {
+                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
                     hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
                             .add(entity);
                 }
@@ -83,7 +70,8 @@ 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()));
+                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
             }
         }
 
@@ -107,13 +95,31 @@ public class EntityRedactionService {
             List<Table> tables = paragraph.getTables();
             for (Table table : tables) {
                 if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                 } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
                 }
                 sectionNumber.incrementAndGet();
             }
-            sectionSearchableTextPairs.add(processText(paragraph, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
+            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
+                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
+                    .getImages()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Header header : classifiedDoc.getHeaders()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Footer footer : classifiedDoc.getFooters()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
+            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
+                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
             sectionNumber.incrementAndGet();
         }
 
@@ -121,6 +127,10 @@ 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 -> {
@@ -150,31 +160,47 @@ public class EntityRedactionService {
     }
 
 
-    private List<SectionSearchableTextPair> processTablePerRow(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) {
 
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
 
-        int rowNumber = 0;
         for (List<Cell> row : table.getRows()) {
             SearchableText searchableRow = new SearchableText();
             Map<String, CellValue> tabularData = new HashMap<>();
             int start = 0;
             List<Integer> cellStarts = new ArrayList<>();
+            SectionText sectionText = new SectionText();
             for (Cell cell : row) {
+
                 if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
                     continue;
                 }
+
+                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());
+                sectionText.getSectionAreas().add(sectionArea);
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+
                 addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
                 int cellStart = start;
 
-                if(rowNumber != 0) {
+                if (!cell.isHeaderCell()) {
                     cell.getHeaderCells().forEach(headerCell -> {
                         StringBuilder headerBuilder = new StringBuilder();
                         headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                        String headerName = headerBuilder.toString().replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+                        String headerName = headerBuilder.toString()
+                                .replaceAll("\n", "")
+                                .replaceAll(" ", "")
+                                .replaceAll("-", "");
+                        sectionArea.setHeader(headerName);
                         tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
                     });
                 }
@@ -185,6 +211,7 @@ public class EntityRedactionService {
                 }
                 cellStarts.add(cellStart);
                 start = start + cell.toString().trim().length() + 1;
+
             }
             Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
             surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
@@ -204,25 +231,49 @@ public class EntityRedactionService {
                     .dictionary(dictionary)
                     .build(), searchableRow));
 
+            if (!local) {
+                sectionText.setText(searchableRow.toString());
+                sectionText.setHeadline(table.getHeadline());
+                sectionText.setSectionNumber(sectionNumber.intValue());
+                sectionText.setTable(true);
+                sectionText.setTabularData(tabularData);
+                sectionText.setCellStarts(cellStarts);
+                classifiedDoc.getSectionText().add(sectionText);
+            }
+
             sectionNumber.incrementAndGet();
-            rowNumber++;
         }
+
         return sectionSearchableTextPairs;
     }
 
 
-    private List<SectionSearchableTextPair> processTableAsOneText(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) {
 
         List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
         SearchableText entireTableText = new SearchableText();
+        SectionText sectionText = new SectionText();
         for (List<Cell> row : table.getRows()) {
             for (Cell cell : row) {
                 if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
                     continue;
                 }
+
+                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());
+                    sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+                    sectionText.getSectionAreas().add(sectionArea);
+                }
+
                 for (TextBlock textBlock : cell.getTextBlocks()) {
                     entireTableText.addAll(textBlock.getSequences());
                 }
@@ -247,18 +298,46 @@ public class EntityRedactionService {
                 .dictionary(dictionary)
                 .build(), entireTableText));
 
+        if (!local) {
+            sectionText.setText(entireTableText.toString());
+            sectionText.setHeadline(table.getHeadline());
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(true);
+            classifiedDoc.getSectionText().add(sectionText);
+        }
+
         return sectionSearchableTextPairs;
     }
 
 
-    private SectionSearchableTextPair processText(Paragraph paragraph, ManualRedactions manualRedactions,
-                                                  AtomicInteger sectionNumber, Dictionary dictionary, boolean local,
-                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+    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) {
 
-        SearchableText searchableText = paragraph.getSearchableText();
-        addSectionToManualRedactions(paragraph.getTextBlocks(), manualRedactions, paragraph.getHeadline(), sectionNumber
-                .intValue());
-        Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber.intValue(), dictionary, local);
+        if (!local) {
+            SectionText sectionText = new SectionText();
+            for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
+                SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
+                        .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
+                sectionText.getSectionAreas().add(sectionArea);
+            }
+
+            sectionText.setText(searchableText.toString());
+            sectionText.setHeadline(headline);
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(false);
+            sectionText.setImages(images.stream()
+                    .map(image -> convert(image, sectionNumber.intValue(), headline))
+                    .collect(Collectors.toSet()));
+            sectionText.setTextBlocks(paragraphTextBlocks);
+            classifiedDoc.getSectionText().add(sectionText);
+        }
+
+        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
+        Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
         surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
 
         return new SectionSearchableTextPair(Section.builder()
@@ -269,16 +348,19 @@ public class EntityRedactionService {
                         .collect(Collectors.toSet()) : entities)
                 .text(searchableText.getAsStringWithLinebreaks())
                 .searchText(searchableText.toString())
-                .headline(paragraph.getHeadline())
+                .headline(headline)
                 .sectionNumber(sectionNumber.intValue())
                 .searchableText(searchableText)
                 .dictionary(dictionary)
+                .images(images.stream()
+                        .map(image -> convert(image, sectionNumber.intValue(), headline))
+                        .collect(Collectors.toSet()))
                 .build(), searchableText);
     }
 
 
-    private Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                     Dictionary dictionary, boolean local) {
+    public Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                    Dictionary dictionary, boolean local) {
 
         Set<Entity> found = new HashSet<>();
         String searchableString = searchableText.toString();
@@ -289,9 +371,9 @@ public class EntityRedactionService {
         String lowercaseInputString = searchableString.toLowerCase();
         for (DictionaryModel model : dictionary.getDictionaryModels()) {
             if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
             } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
             }
         }
 
@@ -318,4 +400,18 @@ 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

@@ -0,0 +1,62 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+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;
+import org.springframework.stereotype.Service;
+
+import javax.imageio.ImageIO;
+import java.io.ByteArrayOutputStream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageClassificationService {
+
+    private final ImageClassificationClient imageClassificationClient;
+    private final RedactionServiceSettings settings;
+
+
+    public void classifyImages(Page page) {
+
+        page.getImages().forEach(image -> {
+
+            if (settings.isEnableImageClassification()) {
+
+                long start = System.currentTimeMillis();
+                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                    ImageIO.write(image.getImage(), "png", baos);
+                    var mockFile = new MockMultipartFile("file", "Image.png", "image/png", baos.toByteArray());
+                    ImageClassificationResponse response = imageClassificationClient.classify(mockFile);
+                    image.setImageType(ImageType.valueOf(response.getCategory()));
+                } catch (Exception e) {
+                    log.error("Could not classify image", e);
+                    image.setImageType(ImageType.OTHER);
+                }
+
+                log.info("Image classification took: " + (System.currentTimeMillis() - start));
+            } else {
+                image.setImageType(ImageType.OTHER);
+            }
+
+            image.getImage().flush();
+            image.setImage(null);
+
+            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);
+                    }
+                });
+            }
+        });
+
+    }
+
+}

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

@@ -0,0 +1,291 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.file.management.v1.api.model.FileType;
+import com.iqser.red.service.redaction.v1.model.*;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.Text;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ReanalyzeService {
+
+    private final DictionaryService dictionaryService;
+    private final DroolsExecutionService droolsExecutionService;
+    private final SurroundingWordsService surroundingWordsService;
+    private final EntityRedactionService entityRedactionService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final RedactionStorageService redactionStorageService;
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionChangeLogService redactionChangeLogService;
+    private final AnalyzeResponseService analyzeResponseService;
+
+
+    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var pageCount = 0;
+        Document classifiedDoc;
+
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
+                    .getProjectId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+            pageCount = classifiedDoc.getPages().size();
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+        log.info("Document structure analysis successful, starting redaction analysis...");
+
+        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions(), analyzeRequest
+                .getProjectId());
+        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
+                .getRuleSetId());
+
+        log.info("Redaction analysis successful...");
+
+        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion()
+                .getRulesetVersion(), classifiedDoc.getRulesVersion(), analyzeRequest.getRuleSetId(), classifiedDoc.getDictionaryVersion()
+                .getDossierVersion());
+
+        log.info("Analyzed with rules {} and dictionary {} for ruleSet: {}", classifiedDoc.getRulesVersion(), classifiedDoc
+                .getDictionaryVersion(), analyzeRequest.getRuleSetId());
+
+        // first create changelog - this only happens when we migrate files analyzed via the old process and we don't want to loose changeLog data
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), redactionLog);
+        // store redactionLog
+        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
+                .getSectionText()));
+        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
+                .getSectionGrid());
+
+        long duration = System.currentTimeMillis() - startTime;
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
+    }
+
+
+    @SneakyThrows
+    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
+        var text = redactionStorageService.getText(analyzeRequest.getProjectId(), analyzeRequest.getFileId());
+
+        // not yet ready for reanalysis
+        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
+            return analyze(analyzeRequest);
+        }
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getRuleSetId(), new DictionaryVersion(redactionLog
+                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getProjectId());
+
+        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
+        Map<String, List<Comment>> comments = null;
+        Set<ManualRedactionEntry> manualAdds = null;
+
+        if (analyzeRequest.getManualRedactions() != null) {
+            // TODO comments will be removed from redactionLog, so we ignore this first.
+            comments = analyzeRequest.getManualRedactions().getComments();
+            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
+        }
+
+        Set<Integer> sectionsToReanalyse = new HashSet<>();
+        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+                sectionsToReanalyse.add(entry.getSectionNumber());
+            }
+            if (entry.isImage() || entry.getType().equals("image")) {
+                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
+            }
+        }
+
+        for (SectionText sectionText : text.getSectionTexts()) {
+
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+                sectionsToReanalyse.add(sectionText.getSectionNumber());
+            }
+
+            if (manualAdds != null) {
+                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
+                    for (ManualRedactionEntry manualAdd : manualAdds) {
+                        for (Rectangle manualPosition : manualAdd.getPositions()) {
+                            if (sectionArea.contains(manualPosition)) {
+                                manualAdd.setSection(sectionText.getHeadline());
+                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);
+
+        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+        }
+
+        List<SectionText> reanalysisSections = new ArrayList<>();
+
+        for (SectionText sectionText : text.getSectionTexts()) {
+
+            if (sectionsToReanalyse.contains(sectionText.getSectionNumber())) {
+                reanalysisSections.add(sectionText);
+            }
+        }
+
+        //--
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getRuleSetId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getRuleSetId(), analyzeRequest.getProjectId());
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (SectionText reanalysisSection : reanalysisSections) {
+
+            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
+                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
+            if (reanalysisSection.getCellStarts() != null) {
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
+                        .getCellStarts());
+            } else {
+                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
+            }
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(false)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(entities)
+                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
+                    .searchText(reanalysisSection.getSearchableText().toString())
+                    .headline(reanalysisSection.getHeadline())
+                    .sectionNumber(reanalysisSection.getSectionNumber())
+                    .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<>();
+        for (Entity entity : entities) {
+            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
+            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
+                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
+                        .add(entityPositionSequence);
+            }
+
+            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
+                entitiesPerPage.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(), entity.isDossierDictionaryEntry()));
+            }
+        }
+
+        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+        for (int page = 1; page <= text.getNumberOfPages(); page++) {
+            if (entitiesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
+                        .getRuleSetId()));
+            }
+
+            if (imagesPerPage.get(page) != null) {
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
+                        .getRuleSetId()));
+            }
+
+            newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, analyzeRequest
+                    .getRuleSetId()));
+        }
+
+        redactionLog.getRedactionLogEntry()
+                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
+        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
+
+    }
+
+
+    private AnalyzeResult finalizeAnalysis(@RequestBody AnalyzeRequest analyzeRequest, long startTime,
+                                           RedactionLog redactionLog, Text text,
+                                           DictionaryIncrement dictionaryIncrement) {
+
+        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getRulesetVersion());
+        redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());
+
+        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), redactionLog);
+        redactionStorageService.storeObject(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
+
+        long duration = System.currentTimeMillis() - startTime;
+
+        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getProjectId(), analyzeRequest.getFileId(), duration, text
+                .getNumberOfPages(), redactionLog, changeLog);
+    }
+
+
+    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
+
+        if (manualRedactions == null) {
+            return new HashSet<>();
+        }
+
+        return Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
+                .collect(Collectors.toSet());
+    }
+
+
+    public Image convert(RedactionLogEntry entry) {
+
+        Rectangle position = entry.getPositions().get(0);
+
+        return Image.builder()
+                .type(entry.getType())
+                .position(new RedRectangle2D(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/RedactionChangeLogService.java

@@ -0,0 +1,93 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.file.management.v1.api.model.FileType;
+import com.iqser.red.service.redaction.v1.model.ChangeType;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
+import com.iqser.red.service.redaction.v1.model.RedactionChangeLogEntry;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionChangeLogService {
+
+    private final RedactionStorageService redactionStorageService;
+
+    public RedactionChangeLog createAndStoreChangeLog(String projectId, String fileId, RedactionLog currentRedactionLog) {
+
+        try {
+            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(projectId, fileId);
+            var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
+            redactionStorageService.storeObject(projectId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
+            return changeLog;
+        } catch (Exception e) {
+            log.debug("Previous redaction log not available");
+            return null;
+        }
+
+    }
+
+
+    private RedactionChangeLog createChangeLog(RedactionLog currentRedactionLog, RedactionLog previousRedactionLog) {
+
+
+        if (previousRedactionLog == null) {
+            return null;
+        }
+
+        List<RedactionLogEntry> added = new ArrayList<>(currentRedactionLog.getRedactionLogEntry());
+        added.removeAll(previousRedactionLog.getRedactionLogEntry());
+
+        List<RedactionLogEntry> removed = new ArrayList<>(previousRedactionLog.getRedactionLogEntry());
+        removed.removeAll(currentRedactionLog.getRedactionLogEntry());
+
+        List<RedactionChangeLogEntry> changeLogEntries = added.stream()
+                .map(entry -> convert(entry, ChangeType.ADDED))
+                .collect(Collectors.toList());
+        changeLogEntries.addAll(removed.stream()
+                .map(entry -> convert(entry, ChangeType.REMOVED))
+                .collect(Collectors.toList()));
+
+        return new RedactionChangeLog(changeLogEntries, currentRedactionLog.getDictionaryVersion(), currentRedactionLog.getRulesVersion(), currentRedactionLog
+                .getRuleSetId());
+    }
+
+
+    private RedactionChangeLogEntry convert(RedactionLogEntry entry, ChangeType changeType) {
+
+        return RedactionChangeLogEntry.builder()
+                .id(entry.getId())
+                .type(entry.getType())
+                .value(entry.getValue())
+                .reason(entry.getReason())
+                .matchedRule(entry.getMatchedRule())
+                .legalBasis(entry.getLegalBasis())
+                .redacted(entry.isRedacted())
+                .isHint(entry.isHint())
+                .isRecommendation(entry.isRecommendation())
+                .section(entry.getSection())
+                .color(entry.getColor())
+                .positions(entry.getPositions())
+                .sectionNumber(entry.getSectionNumber())
+                .manual(entry.isManual())
+                .status(entry.getStatus())
+                .manualRedactionType(entry.getManualRedactionType())
+                .isDictionaryEntry(entry.isDictionaryEntry())
+                .textBefore(entry.getTextBefore())
+                .textAfter(entry.getTextAfter())
+                .comments(entry.getComments())
+                .changeType(changeType)
+                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
+                .build();
+    }
+
+}

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

@@ -1,46 +1,33 @@
 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;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.pdfbox.text.TextPosition;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.model.CellRectangle;
-import com.iqser.red.service.redaction.v1.model.Comment;
-import com.iqser.red.service.redaction.v1.model.IdRemoval;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import com.iqser.red.service.redaction.v1.model.SectionRectangle;
-import com.iqser.red.service.redaction.v1.model.Status;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
 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;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class RedactionLogCreatorService {
 
-    private static final String IMAGE = "image";
-
     private final DictionaryService dictionaryService;
 
 
@@ -54,37 +41,110 @@ public class RedactionLogCreatorService {
             addSectionGrid(classifiedDoc, page);
 
             if (classifiedDoc.getEntities().get(page) != null) {
-                addEntries(classifiedDoc, manualRedactions, page, ruleSetId);
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, ruleSetId));
             }
 
             if (manualRedactionPages.contains(page)) {
-                addManualEntries(classifiedDoc, manualRedactions, page, ruleSetId);
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
             }
 
-            if (!classifiedDoc.getPages().get(page - 1).getImageBounds().isEmpty()) {
-                addImageEntries(classifiedDoc, page, ruleSetId);
+            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, ruleSetId));
             }
         }
     }
 
 
-    private void addImageEntries(Document classifiedDoc, int pageNumber, String 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);
 
-        for (Rectangle2D imageBounds : classifiedDoc.getPages().get(pageNumber - 1).getImageBounds()) {
             RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
-                    .id(IdBuilder.buildId(imageBounds, pageNumber))
-                    .color(getColor(IMAGE, ruleSetId))
-                    .type(IMAGE)
-                    .redacted(false)
-                    .isHint(true)
+                    .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))
                     .manual(false)
                     .isDictionaryEntry(false)
                     .isRecommendation(false)
-                    .positions(List.of(new Rectangle(new Point((float) imageBounds.getX(), (float) imageBounds.getY()), (float) imageBounds
-                            .getWidth(), (float) imageBounds.getHeight(), pageNumber)))
+                    .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())
                     .build();
-            classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+
+            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);
         }
+
+        return redactionLogEntities;
     }
 
 
@@ -105,13 +165,16 @@ public class RedactionLogCreatorService {
     }
 
 
-    private void addEntries(Document classifiedDoc, 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<>();
 
         // Duplicates can exist due table extraction colums over multiple rows.
         Set<String> processedIds = new HashSet<>();
 
         entityLoop:
-        for (Entity entity : classifiedDoc.getEntities().get(page)) {
+        for (Entity entity : entities.get(page)) {
 
             List<Comment> comments = null;
 
@@ -136,9 +199,11 @@ public class RedactionLogCreatorService {
                                 redactionLogEntry.setRedacted(false);
                                 redactionLogEntry.setStatus(Status.APPROVED);
                                 manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
                             } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
                                 manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
                                 redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
                             } else {
                                 redactionLogEntry.setStatus(Status.DECLINED);
                             }
@@ -149,7 +214,34 @@ public class RedactionLogCreatorService {
                             redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
                         }
                     }
+                }
 
+                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
+                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
+                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
+                            String manualOverrideReason = null;
+                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
+                                entity.setRedaction(true);
+                                redactionLogEntry.setRedacted(true);
+                                redactionLogEntry.setStatus(Status.APPROVED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, false));
+                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
+                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, true));
+                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                            } else {
+                                redactionLogEntry.setStatus(Status.DECLINED);
+                            }
+
+                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
+                            redactionLogEntry.setReason(manualOverrideReason);
+                            redactionLogEntry.setManual(true);
+                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
+                        }
+                    }
                 }
 
                 if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
@@ -171,31 +263,33 @@ public class RedactionLogCreatorService {
 
                 // FIXME ids should never be null. Figure out why this happens.
                 if (redactionLogEntry.getId() != null) {
-                    classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+                    redactionLogEntities.add(redactionLogEntry);
                 }
             }
         }
+
+        return redactionLogEntities;
     }
 
 
-    private List<Rectangle> getRectanglesPerLine(List<TextPosition> textPositions, int page) {
+    private List<Rectangle> getRectanglesPerLine(List<RedTextPosition> textPositions, int page) {
 
         List<Rectangle> rectangles = new ArrayList<>();
         if (textPositions.size() == 1) {
-            rectangles.add(new TextPositionSequence(textPositions, page).getRectangle());
+            rectangles.add( TextPositionSequence.fromData(textPositions, page).getRectangle());
         } else {
             float y = textPositions.get(0).getYDirAdj();
             int startIndex = 0;
             for (int i = 1; i < textPositions.size(); i++) {
                 float yDirAdj = textPositions.get(i).getYDirAdj();
                 if (yDirAdj != y) {
-                    rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, i), page).getRectangle());
+                    rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, i), page).getRectangle());
                     y = yDirAdj;
                     startIndex = i;
                 }
             }
-            if (startIndex != textPositions.size() - 1) {
-                rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+            if (startIndex != textPositions.size()) {
+                rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
             }
         }
 
@@ -203,14 +297,17 @@ public class RedactionLogCreatorService {
     }
 
 
-    private void addManualEntries(Document classifiedDoc, ManualRedactions manualRedactions, int page,
-                                  String ruleSetId) {
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, int page,
+                                                       String ruleSetId) {
 
-        if (manualRedactions == null) {
-            return;
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        if (manualAdds == null) {
+            return redactionLogEntities;
         }
 
-        for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
 
             String id = manualRedactionEntry.getId();
 
@@ -224,11 +321,13 @@ public class RedactionLogCreatorService {
                 }
             }
 
-            redactionLogEntry.setComments(manualRedactions.getComments().get(id));
+            redactionLogEntry.setComments(comments.get(id));
             if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
+                redactionLogEntities.add(redactionLogEntry);
             }
         }
+
+        return redactionLogEntities;
     }
 
 
@@ -256,6 +355,7 @@ public class RedactionLogCreatorService {
                 .status(manualRedactionEntry.getStatus())
                 .manualRedactionType(ManualRedactionType.ADD)
                 .isDictionaryEntry(false)
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
                 .build();
     }
 
@@ -277,6 +377,9 @@ public class RedactionLogCreatorService {
                 .isDictionaryEntry(entity.isDictionaryEntry())
                 .textAfter(entity.getTextAfter())
                 .textBefore(entity.getTextBefore())
+                .startOffset(entity.getStart())
+                .endOffset(entity.getEnd())
+                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
                 .build();
     }
 
@@ -310,6 +413,18 @@ 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

@@ -1,29 +1,55 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-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;
-
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 @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) {
+                            boolean local, boolean isDossierDictionary) {
 
         Set<Entity> found = new HashSet<>();
 
@@ -43,7 +69,7 @@ public class EntitySearchUtils {
 
                 if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
                         .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local));
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local, isDossierDictionary));
                 }
             } while (startIndex > -1);
         }
@@ -113,12 +139,18 @@ public class EntitySearchUtils {
 
     public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {
 
-        if(entities.contains(found)){
+        if (entities.contains(found)) {
             Entity existing = entities.stream().filter(entity -> entity.equals(found)).findFirst().get();
-            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){
+            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())) {
                 entities.remove(found);
             }
         }
         entities.add(found);
     }
+
+    public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found) {
+        // HashSet keeps old value but we want the new.
+        entities.removeAll(found);
+        entities.addAll(found);
+    }
 }

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

@@ -1,15 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
-import java.awt.geom.Rectangle2D;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
 import lombok.experimental.UtilityClass;
 
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 @UtilityClass
 public class IdBuilder {
 
@@ -26,14 +25,9 @@ public class IdBuilder {
     }
 
 
-    public String buildId(Rectangle2D rectangle2D, int page){
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("x").append(rectangle2D.getX()).append("y").append(rectangle2D.getY()).append("h").append(rectangle2D.getHeight()).append("w").append(rectangle2D.getWidth()).append("p").append(page);
-
-        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
+    public String buildId(RedRectangle2D rectangle2D, int page) {
+        return hashFunction.hashString("x" + rectangle2D.getX() + "y" + rectangle2D.getY() + "h" + rectangle2D.getHeight() + "w" + rectangle2D.getWidth() + "p" + page, StandardCharsets.UTF_8).toString();
     }
 
 
-
 }

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

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.utils;
 
+import lombok.experimental.UtilityClass;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -8,8 +10,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import lombok.experimental.UtilityClass;
-
 @UtilityClass
 public class ResourceLoader {
 
@@ -27,4 +27,4 @@ public class ResourceLoader {
 
     }
 
-}
+}

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

@@ -7,6 +7,7 @@ public class TextNormalizationUtilities {
 
     /**
      * Revert hyphenation due to line breaks.
+     *
      * @param text Text to be processed.
      * @return Text without line-break hyphenation.
      */
@@ -14,4 +15,4 @@ public class TextNormalizationUtilities {
         return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
     }
 
-}
+}

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

@@ -1,97 +1,275 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.stereotype.Service;
-
 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.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.memory.MemoryStats;
 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.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.stereotype.Service;
+
+import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class PdfSegmentationService {
 
+    private final static int MAX_PAGES_BEFORE_GC = 250;
+
     private final RulingCleaningService rulingCleaningService;
     private final TableExtractionService tableExtractionService;
     private final BlockificationService blockificationService;
     private final ClassificationService classificationService;
     private final SectionsBuilderService sectionsBuilderService;
+    private final ImageClassificationService imageClassificationService;
 
 
-    public Document parseDocument(PDDocument pdDocument) throws IOException {
+    public Document parseDocument(InputStream documentInputStream) throws IOException {
+        return parseDocument(documentInputStream, false);
+    }
 
-        Document document = new Document();
+    public Document parseDocument(InputStream documentInputStream, boolean ignoreImages) throws IOException {
+        PDDocument pdDocument = null;
+        try {
+            //create tempFile
+            File tempFile = File.createTempFile("document", ".pdf");
+            IOUtils.copy(documentInputStream, new FileOutputStream(tempFile));
 
-        List<Page> pages = new ArrayList<>();
-        PDFLinesTextStripper stripper = new PDFLinesTextStripper();
-        for (int pageNumber = 1; pageNumber <= pdDocument.getNumberOfPages(); pageNumber++) {
-            PDPage pdPage = pdDocument.getPage(pageNumber - 1);
-            stripper.setPageNumber(pageNumber);
-            stripper.setStartPage(pageNumber);
-            stripper.setEndPage(pageNumber);
-            stripper.setPdpage(pdPage);
-            stripper.getText(pdDocument);
+            // initialize required variables
+            Document document = new Document();
+            List<Page> pages = new ArrayList<>();
 
-            PDRectangle pdr = pdPage.getMediaBox();
-            boolean isLandscape = pdr.getWidth() > pdr.getHeight();
 
-            int rotation = pdPage.getRotation();
-            boolean isRotated = rotation != 0 && rotation != 360;
+            pdDocument = reinitializePDDocument(tempFile, null);
+            long pageCount = pdDocument.getNumberOfPages();
 
-            ParsedElements parsedElements = ParsedElements.builder()
-                    .rulings(stripper.getRulings())
-                    .sequences(stripper.getTextPositionSequences())
-                    .imageBounds(stripper.getImageBounds())
-                    .minCharWidth(stripper.getMinCharWidths())
-                    .landscape(isLandscape)
-                    .rotated(isRotated)
-                    .build();
+            for (int pageNumber = 1; pageNumber <= pageCount; pageNumber++) {
 
-            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), parsedElements
-                    .getMinCharWidth());
+                if (pageNumber % MAX_PAGES_BEFORE_GC == 0) {
+                    pdDocument = reinitializePDDocument(tempFile, pdDocument);
+                }
 
-            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings
-                    .getVertical());
-            page.setRotation(rotation);
+                PDFLinesTextStripper stripper = new PDFLinesTextStripper();
+                PDPage pdPage = pdDocument.getPage(pageNumber - 1);
+                stripper.setPageNumber(pageNumber);
+                stripper.setStartPage(pageNumber);
+                stripper.setEndPage(pageNumber);
+                stripper.setPdpage(pdPage);
+                stripper.getText(pdDocument);
 
-            tableExtractionService.extractTables(cleanRulings, page);
+                PDRectangle pdr = pdPage.getMediaBox();
+                boolean isLandscape = pdr.getWidth() > pdr.getHeight();
 
-            buildPageStatistics(page);
+                int rotation = pdPage.getRotation();
+                boolean isRotated = rotation != 0 && rotation != 360;
 
-            page.setLandscape(parsedElements.isLandscape() || parsedElements.isRotated());
+                CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
+                        .getMaxCharHeight());
 
-            page.setPageNumber(pageNumber);
-            increaseDocumentStatistics(page, document);
-            page.setImageBounds(parsedElements.getImageBounds());
-            pages.add(page);
+                Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
+                        .getVertical());
+
+                page.setRotation(rotation);
+                page.setLandscape(isLandscape || isRotated);
+                page.setPageNumber(pageNumber);
+                List<PdfImage> mergedList = processImages(stripper.getImages());
+                page.setImages(mergedList);
+
+                tableExtractionService.extractTables(cleanRulings, page);
+                buildPageStatistics(page);
+                increaseDocumentStatistics(page, document);
+
+
+                if (!ignoreImages) {
+                    imageClassificationService.classifyImages(page);
+                }
+
+                pages.add(page);
+
+
+            }
+
+            document.setPages(pages);
+
+            classificationService.classifyDocument(document);
+            sectionsBuilderService.buildSections(document);
+            sectionsBuilderService.addImagesToSections(document);
+
+            pdDocument = reinitializePDDocument(tempFile, pdDocument);
+
+            IOUtils.close(pdDocument);
+
+            tempFile.delete();
+
+            return document;
+        } finally {
+            if (pdDocument != null) {
+                pdDocument.close();
+            }
+        }
+    }
+
+    private PDDocument reinitializePDDocument(File tempFile, PDDocument pdDocument) throws IOException {
+        if (pdDocument != null) {
+            pdDocument.close();
+        }
+        System.runFinalization();
+        System.gc();
+
+        MemoryStats.printMemoryStats();
+
+        var newPDDocument = PDDocument.load(tempFile, MemoryUsageSetting.setupTempFileOnly());
+        newPDDocument.setAllSecurityToBeRemoved(true);
+
+        return newPDDocument;
+    }
+
+    //merge images, if they are separated during pdf import, return new list of Pdfimages
+    private List<PdfImage> processImages(List<PdfImage> imageList) {
+        if (imageList.size() > 1) {
+            List<PdfImage> mergedList = new ArrayList<>();
+            int countElementsInList = 0;
+            boolean beginImage = true;
+
+            // a List of Boolean, true = candidate for merging, false = no merging
+            List<Boolean> candidatesList = getCandidatesList(imageList);
+
+            // loop through list, if there are candidates for merging (true), merge images and add it to mergedList
+            for (int i = 0; i < candidatesList.size(); i++) {
+                if (candidatesList.get(i)) {
+                    if (beginImage) {
+                        //begin of image, merge two parts of imageList
+                        PdfImage mergedImage = mergeTwoImages(imageList.get(i), imageList.get(i + 1));
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.add(mergedImage);
+                            countElementsInList++;
+                        }
+                    } else {
+                        //middle of an image, merge current piece auf mergedList with image of imageList
+                        PdfImage mergedImage = mergeTwoImages(mergedList.get(countElementsInList - 1), imageList.get(i + 1));
+                        // image merge successful
+                        if (mergedImage != null) {
+                            mergedList.set(countElementsInList - 1, mergedImage);
+                        }
+                    }
+                    beginImage = false;
+                } else {
+                    // if the last candidate is false, then both images i and i+1 must be added
+                    if (i == candidatesList.size() - 1) {
+                        if (countElementsInList > 0 && mergedList.get(countElementsInList - 1) == imageList.get(i)) {
+                            mergedList.add(imageList.get(i + 1));
+                        } else {
+                            mergedList.add(imageList.get(i));
+                            mergedList.add(imageList.get(i + 1));
+                        }
+                    } else {
+                        //first image is not splitted, add i to resultlist
+                        if (beginImage) {
+                            mergedList.add(imageList.get(i));
+                            countElementsInList++;
+                        } else {
+                            // i is the end of an image, add begin of new image
+                            mergedList.add(imageList.get(i + 1));
+                            countElementsInList++;
+                            beginImage = false;
+                        }
+                    }
+                }
+            }
+            return mergedList;
+        } else {
+            return imageList;
+        }
+    }
+
+    private PdfImage mergeTwoImages(PdfImage image1, PdfImage image2) {
+
+        // diese Angaben von getPosition scheinen nicht richtig zu sein, damit werden teile des Bildes abgeschnitten
+        double width = image1.getPosition().getWidth();
+        double height1 = image1.getPosition().getHeight();
+        double height2 = image2.getPosition().getHeight();
+        // mit  den Werten, die unter Image gespeichert sind, funktioniert es
+        double img1height = image1.getImage().getHeight();
+        double img1width = image1.getImage().getWidth();
+        double img2height = image2.getImage().getHeight();
+
+        BufferedImage mergedImage = new BufferedImage((int) img1width, (int) (img1height + img2height), BufferedImage.TYPE_INT_RGB);
+        Graphics mergedImageGraphics = mergedImage.getGraphics();
+        try {
+            mergedImageGraphics.drawImage(image1.getImage(), 0, 0, null);
+            mergedImageGraphics.drawImage(image2.getImage(), 0, (int) (img1height), null);
+
+            // set Image, Position and type for merged Image
+            //set position for merged image with values of image1 and the height of both
+            Rectangle2D pos = new Rectangle2D.Float();
+            pos.setRect(image1.getPosition().getX(), image2.getPosition().getY(), width, height1 + height2);
+            PdfImage newPdfImage = new PdfImage(mergedImage, pos, image1.getPage());
+            // Graphics need to be disposed
+
+            image1.getImage().flush();
+            image2.getImage().flush();
+
+            mergedImage.flush();
+            mergedImageGraphics.dispose();
+
+            return newPdfImage;
+        } catch (Exception e) {
+            // failed to merge image
+            log.error("Failed to merge image", e);
+            return null;
         }
 
-        document.setPages(pages);
 
-        classificationService.classifyDocument(document);
+    }
 
-        sectionsBuilderService.buildSections(document);
+    //make a list of true and false, if the image is a candidate for merging
+    private List<Boolean> getCandidatesList(List<PdfImage> imageList) {
+        List<Boolean> candidatesList = new ArrayList<>();
+        for (int i = 0; i < imageList.size(); i++) {
+            if (i >= 1) {
+                candidatesList.add(isCandidateForMerging(imageList.get(i - 1), imageList.get(i)));
+            }
+        }
+        return candidatesList;
+    }
 
-        return document;
+    // evaluate if two images are candidates for merging, depending on their coordinates, width and height
+    private boolean isCandidateForMerging(PdfImage image1, PdfImage image2) {
+        double x1 = image1.getPosition().getX();
+        double y1 = image1.getPosition().getY();
+        double width1 = image1.getPosition().getWidth();
+        double x2 = image2.getPosition().getX();
+        double y2 = image2.getPosition().getY();
+        double width2 = image2.getPosition().getWidth();
+        double height2 = image2.getPosition().getHeight();
+        //if the x-coordinates and widths of images are equal and the height is equal to difference between y-coordinates,
+        // then it is the same picture and has to be merged -> return true
+        return x1 == x2 && width1 == width2 && Math.ceil(height2) == Math.ceil(y1 - y2) && width2 > (height2 / 6);
     }
 
 
@@ -125,4 +303,5 @@ public class PdfSegmentationService {
 
     }
 
-}
+
+}

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

@@ -1,21 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-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.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.model.*;
+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;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class SectionsBuilderService {
@@ -24,25 +18,46 @@ public class SectionsBuilderService {
 
         List<AbstractTextContainer> chunkWords = new ArrayList<>();
         List<Paragraph> chunkBlockList = new ArrayList<>();
+        List<Header> headers = new ArrayList<>();
+        List<Footer> footers = new ArrayList<>();
+        List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
 
         AbstractTextContainer prev = null;
 
         String lastHeadline = "";
         Table previousTable = null;
         for (Page page : document.getPages()) {
+            List<TextBlock> header = new ArrayList<>();
+            List<TextBlock> footer = new ArrayList<>();
+            List<TextBlock> unclassifiedText = new ArrayList<>();
             for (AbstractTextContainer current : page.getTextBlocks()) {
 
-                if (current.getClassification() == null || current.getClassification()
-                        .equals("Header") || current.getClassification().equals("Footer")) {
+                if (current.getClassification() == null) {
                     continue;
                 }
 
                 current.setPage(page.getPageNumber());
 
-                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification().startsWith("H ") || !document.isHeadlines()) {
+                if (current.getClassification().equals("Header")) {
+                    header.add((TextBlock) current);
+                    continue;
+                }
+
+                if (current.getClassification().equals("Footer")) {
+                    footer.add((TextBlock) current);
+                    continue;
+                }
+
+                if (current.getClassification().equals("Other")) {
+                    unclassifiedText.add((TextBlock) current);
+                    continue;
+                }
+
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification()
+                        .startsWith("H ") || !document.isHeadlines()) {
                     Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                     chunkBlock.setHeadline(lastHeadline);
-                    if(document.isHeadlines()) {
+                    if (document.isHeadlines()) {
                         lastHeadline = current.getText();
                     }
                     chunkBlockList.add(chunkBlock);
@@ -60,6 +75,16 @@ public class SectionsBuilderService {
                 chunkWords.add(current);
                 prev = current;
             }
+
+            if (!header.isEmpty()) {
+                headers.add(new Header(header));
+            }
+            if (!footer.isEmpty()) {
+                footers.add(new Footer(footer));
+            }
+            if (!unclassifiedText.isEmpty()) {
+                unclassifiedTexts.add(new UnclassifiedText(unclassifiedText));
+            }
         }
 
         Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
@@ -67,6 +92,70 @@ public class SectionsBuilderService {
         chunkBlockList.add(chunkBlock);
 
         document.setParagraphs(chunkBlockList);
+        document.setHeaders(headers);
+        document.setFooters(footers);
+        document.setUnclassifiedTexts(unclassifiedTexts);
+    }
+
+
+    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);
+        }
+
+        // first page is always a paragraph, else we can't process pages 1..N,
+        // where N is the first found page with a paragraph
+        if (paragraphMap.get(1) == null) {
+            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);
+                }
+            }
+        }
     }
 
 
@@ -175,9 +264,9 @@ public class SectionsBuilderService {
 
     private boolean hasInvalidHeaderInformation(Table table) {
 
-        return table.getRows().stream()
-                .flatMap(row -> row.stream()
-                        .filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
+        return table.getRows()
+                .stream()
+                .flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
                 .findAny()
                 .isEmpty();
 
@@ -188,6 +277,9 @@ public class SectionsBuilderService {
 
         for (int i = table.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
             List<Cell> row = table.getRows().get(i);
+            if (row.size() == 1) {
+                continue;
+            }
             boolean allNonHeader = true;
             for (Cell cell : row) {
                 if (cell.isHeaderCell()) {
@@ -204,4 +296,4 @@ public class SectionsBuilderService {
 
     }
 
-}
+}

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

@@ -1,15 +1,16 @@
 package com.iqser.red.service.redaction.v1.server.settings;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
 @ConfigurationProperties("redaction-service")
 public class RedactionServiceSettings {
-    
+
     private int numberOfSurroundingWords = 3;
 
     private int surroundingWordsOffsetWindow = 100;
 
-}
+    private boolean enableImageClassification = true;
+
+}

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

@@ -0,0 +1,103 @@
+package com.iqser.red.service.redaction.v1.server.storage;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.file.management.v1.api.model.FileType;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.classification.model.Text;
+import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
+import com.iqser.red.storage.commons.service.StorageService;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionStorageService {
+
+    private final ObjectMapper objectMapper;
+    private final StorageService storageService;
+
+    @SneakyThrows
+    public InputStream getStoredObject(String storageId) {
+        return storageService.getObject(storageId).getInputStream();
+    }
+
+
+    @SneakyThrows
+    public void storeObject(String projectId, String fileId, FileType fileType, Object any) {
+        storageService.storeObject(StorageIdUtils.getStorageId(projectId, fileId, fileType), objectMapper.writeValueAsBytes(any));
+    }
+
+
+    public RedactionLog getRedactionLog(String projectId, String fileId) {
+
+        InputStreamResource inputStreamResource;
+        try {
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.REDACTION_LOG));
+        } catch (StorageObjectDoesNotExist e) {
+            log.debug("Text not available.");
+            return null;
+        }
+
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), RedactionLog.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert RedactionLog", e);
+        }
+    }
+
+
+    public Text getText(String projectId, String fileId) {
+
+        InputStreamResource inputStreamResource;
+        try {
+            inputStreamResource = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.TEXT));
+        } catch (StorageObjectDoesNotExist e) {
+            log.debug("Text not available.");
+            return null;
+        }
+
+        try {
+            return objectMapper.readValue(inputStreamResource.getInputStream(), Text.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert Text", e);
+        }
+    }
+
+
+    public SectionGrid getSectionGrid(String projectId, String fileId) {
+
+        var sectionGrid = storageService.getObject(StorageIdUtils.getStorageId(projectId, fileId, FileType.SECTION_GRID));
+        try {
+            return objectMapper.readValue(sectionGrid.getInputStream(), SectionGrid.class);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not convert RedactionLog", e);
+        }
+    }
+
+
+    @RequiredArgsConstructor
+    public enum StorageType {
+        PARSED_DOCUMENT(".json");
+
+        @Getter
+        private final String extension;
+
+    }
+
+    public static class StorageIdUtils {
+
+        public static String getStorageId(String projectId, String fileId, FileType fileType) {
+            return projectId + "/" + fileId + "." + fileType.name() + fileType.getExtension();
+        }
+
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,6 +20,8 @@ public abstract class AbstractTextContainer {
     protected String classification;
     protected int page;
 
+    private Orientation orientation = Orientation.NONE;
+
     public abstract String getText();
 
     public boolean contains(AbstractTextContainer other) {
@@ -25,15 +29,17 @@ public abstract class AbstractTextContainer {
     }
 
     public boolean contains(Rectangle other) {
-        return page == other.getPage() && this.minX <= other.getTopLeft().getX() && this.maxX >= other.getTopLeft().getX() + other.getWidth() && this.minY <= other.getTopLeft().getY()  && this.maxY >= other.getTopLeft().getY() + other.getHeight();
+        return page == other.getPage() && this.minX <= other.getTopLeft().getX() && this.maxX >= other.getTopLeft().getX() + other.getWidth() && this.minY <= other.getTopLeft().getY() && this.maxY >= other.getTopLeft().getY() + other.getHeight();
     }
 
+    @JsonIgnore
     public float getHeight() {
         return maxY - minY;
     }
-
+    
+    @JsonIgnore
     public float getWidth() {
         return maxX - minX;
     }
 
-}
+}

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

@@ -1,20 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 @SuppressWarnings("serial")
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class Cell extends Rectangle {
 
     private List<TextBlock> textBlocks = new ArrayList<>();
@@ -69,7 +70,4 @@ public class Cell extends Rectangle {
     }
 
 
-
-
-
-}
+}

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

@@ -1,10 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
-import java.util.List;
-
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @Builder
 public class CleanRulings {

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

@@ -8,170 +8,171 @@ import java.util.List;
 @SuppressWarnings("all")
 public class Rectangle extends Rectangle2D.Float {
 
-	/**
-	 * Ill-defined comparator, from when Rectangle was Comparable.
-	 * 
-	 * see https://github.com/tabulapdf/tabula-java/issues/116
-	 * @deprecated with no replacement
-	 */
-	@Deprecated
-	public static final Comparator<Rectangle> ILL_DEFINED_ORDER = new Comparator<Rectangle>() {
-		@Override public int compare(Rectangle o1, Rectangle o2) {
-			if (o1.equals(o2)) return 0;
-			if (o1.verticalOverlap(o2) > VERTICAL_COMPARISON_THRESHOLD) {
-				return o1.isLtrDominant() == -1 && o2.isLtrDominant() == -1
-				     ? - java.lang.Double.compare(o1.getX(), o2.getX())
-				     : java.lang.Double.compare(o1.getX(), o2.getX());
-			} else {
-				return java.lang.Float.compare(o1.getBottom(), o2.getBottom());
-			}
-		}
-	};
-	
-	protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f;
+    protected static final float VERTICAL_COMPARISON_THRESHOLD = 0.4f;
+    /**
+     * Ill-defined comparator, from when Rectangle was Comparable.
+     * <p>
+     * see https://github.com/tabulapdf/tabula-java/issues/116
+     *
+     * @deprecated with no replacement
+     */
+    @Deprecated
+    public static final Comparator<Rectangle> ILL_DEFINED_ORDER = new Comparator<Rectangle>() {
+        @Override
+        public int compare(Rectangle o1, Rectangle o2) {
+            if (o1.equals(o2)) return 0;
+            if (o1.verticalOverlap(o2) > VERTICAL_COMPARISON_THRESHOLD) {
+                return o1.isLtrDominant() == -1 && o2.isLtrDominant() == -1
+                        ? -java.lang.Double.compare(o1.getX(), o2.getX())
+                        : java.lang.Double.compare(o1.getX(), o2.getX());
+            } else {
+                return java.lang.Float.compare(o1.getBottom(), o2.getBottom());
+            }
+        }
+    };
 
-	public Rectangle() {
-		super();
-	}
+    public Rectangle() {
+        super();
+    }
 
-	public Rectangle(float top, float left, float width, float height) {
-		super();
-		this.setRect(left, top, width, height);
-	}
+    public Rectangle(float top, float left, float width, float height) {
+        super();
+        this.setRect(left, top, width, height);
+    }
 
-	public int compareTo(Rectangle other) {
-		return ILL_DEFINED_ORDER.compare(this, other);
-	}
+    /**
+     * @param rectangles
+     * @return minimum bounding box that contains all the rectangles
+     */
+    public static Rectangle boundingBoxOf(List<? extends Rectangle> rectangles) {
+        float minx = java.lang.Float.MAX_VALUE;
+        float miny = java.lang.Float.MAX_VALUE;
+        float maxx = java.lang.Float.MIN_VALUE;
+        float maxy = java.lang.Float.MIN_VALUE;
 
-	// I'm bad at Java and need this for fancy sorting in
-	// technology.tabula.TextChunk.
-	public int isLtrDominant() {
-		return 0;
-	}
+        for (Rectangle r : rectangles) {
+            minx = (float) Math.min(r.getMinX(), minx);
+            miny = (float) Math.min(r.getMinY(), miny);
+            maxx = (float) Math.max(r.getMaxX(), maxx);
+            maxy = (float) Math.max(r.getMaxY(), maxy);
+        }
+        return new Rectangle(miny, minx, maxx - minx, maxy - miny);
+    }
 
-	public float getArea() {
-		return this.width * this.height;
-	}
+    public int compareTo(Rectangle other) {
+        return ILL_DEFINED_ORDER.compare(this, other);
+    }
 
-	public float verticalOverlap(Rectangle other) {
-		return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop()));
-	}
+    // I'm bad at Java and need this for fancy sorting in
+    // technology.tabula.TextChunk.
+    public int isLtrDominant() {
+        return 0;
+    }
 
-	public boolean verticallyOverlaps(Rectangle other) {
-		return verticalOverlap(other) > 0;
-	}
+    public float getArea() {
+        return this.width * this.height;
+    }
 
-	public float horizontalOverlap(Rectangle other) {
-		return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft()));
-	}
+    public float verticalOverlap(Rectangle other) {
+        return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop()));
+    }
 
-	public boolean horizontallyOverlaps(Rectangle other) {
-		return horizontalOverlap(other) > 0;
-	}
+    public boolean verticallyOverlaps(Rectangle other) {
+        return verticalOverlap(other) > 0;
+    }
 
-	public float verticalOverlapRatio(Rectangle other) {
-		float rv = 0, delta = Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop());
+    public float horizontalOverlap(Rectangle other) {
+        return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft()));
+    }
 
-		if (other.getTop() <= this.getTop() && this.getTop() <= other.getBottom()
-				&& other.getBottom() <= this.getBottom()) {
-			rv = (other.getBottom() - this.getTop()) / delta;
-		} else if (this.getTop() <= other.getTop() && other.getTop() <= this.getBottom()
-				&& this.getBottom() <= other.getBottom()) {
-			rv = (this.getBottom() - other.getTop()) / delta;
-		} else if (this.getTop() <= other.getTop() && other.getTop() <= other.getBottom()
-				&& other.getBottom() <= this.getBottom()) {
-			rv = (other.getBottom() - other.getTop()) / delta;
-		} else if (other.getTop() <= this.getTop() && this.getTop() <= this.getBottom()
-				&& this.getBottom() <= other.getBottom()) {
-			rv = (this.getBottom() - this.getTop()) / delta;
-		}
+    public boolean horizontallyOverlaps(Rectangle other) {
+        return horizontalOverlap(other) > 0;
+    }
 
-		return rv;
+    public float verticalOverlapRatio(Rectangle other) {
+        float rv = 0, delta = Math.min(this.getBottom() - this.getTop(), other.getBottom() - other.getTop());
 
-	}
+        if (other.getTop() <= this.getTop() && this.getTop() <= other.getBottom()
+                && other.getBottom() <= this.getBottom()) {
+            rv = (other.getBottom() - this.getTop()) / delta;
+        } else if (this.getTop() <= other.getTop() && other.getTop() <= this.getBottom()
+                && this.getBottom() <= other.getBottom()) {
+            rv = (this.getBottom() - other.getTop()) / delta;
+        } else if (this.getTop() <= other.getTop() && other.getTop() <= other.getBottom()
+                && other.getBottom() <= this.getBottom()) {
+            rv = (other.getBottom() - other.getTop()) / delta;
+        } else if (other.getTop() <= this.getTop() && this.getTop() <= this.getBottom()
+                && this.getBottom() <= other.getBottom()) {
+            rv = (this.getBottom() - this.getTop()) / delta;
+        }
 
-	public float overlapRatio(Rectangle other) {
-		double intersectionWidth = Math.max(0,
-				Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft()));
-		double intersectionHeight = Math.max(0,
-				Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop()));
-		double intersectionArea = Math.max(0, intersectionWidth * intersectionHeight);
-		double unionArea = this.getArea() + other.getArea() - intersectionArea;
+        return rv;
 
-		return (float) (intersectionArea / unionArea);
-	}
+    }
 
-	public Rectangle merge(Rectangle other) {
-		this.setRect(this.createUnion(other));
-		return this;
-	}
+    public float overlapRatio(Rectangle other) {
+        double intersectionWidth = Math.max(0,
+                Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft()));
+        double intersectionHeight = Math.max(0,
+                Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop()));
+        double intersectionArea = Math.max(0, intersectionWidth * intersectionHeight);
+        double unionArea = this.getArea() + other.getArea() - intersectionArea;
 
-	public float getTop() {
-		return (float) this.getMinY();
-	}
+        return (float) (intersectionArea / unionArea);
+    }
 
-	public void setTop(float top) {
-		float deltaHeight = top - this.y;
-		this.setRect(this.x, top, this.width, this.height - deltaHeight);
-	}
+    public Rectangle merge(Rectangle other) {
+        this.setRect(this.createUnion(other));
+        return this;
+    }
 
-	public float getRight() {
-		return (float) this.getMaxX();
-	}
+    public float getTop() {
+        return (float) this.getMinY();
+    }
 
-	public void setRight(float right) {
-		this.setRect(this.x, this.y, right - this.x, this.height);
-	}
+    public void setTop(float top) {
+        float deltaHeight = top - this.y;
+        this.setRect(this.x, top, this.width, this.height - deltaHeight);
+    }
 
-	public float getLeft() {
-		return (float) this.getMinX();
-	}
+    public float getRight() {
+        return (float) this.getMaxX();
+    }
 
-	public void setLeft(float left) {
-		float deltaWidth = left - this.x;
-		this.setRect(left, this.y, this.width - deltaWidth, this.height);
-	}
+    public void setRight(float right) {
+        this.setRect(this.x, this.y, right - this.x, this.height);
+    }
 
-	public float getBottom() {
-		return (float) this.getMaxY();
-	}
+    public float getLeft() {
+        return (float) this.getMinX();
+    }
 
-	public void setBottom(float bottom) {
-		this.setRect(this.x, this.y, this.width, bottom - this.y);
-	}
+    public void setLeft(float left) {
+        float deltaWidth = left - this.x;
+        this.setRect(left, this.y, this.width - deltaWidth, this.height);
+    }
 
-	public Point2D[] getPoints() {
-		return new Point2D[] { new Point2D.Float(this.getLeft(), this.getTop()),
-				new Point2D.Float(this.getRight(), this.getTop()), new Point2D.Float(this.getRight(), this.getBottom()),
-				new Point2D.Float(this.getLeft(), this.getBottom()) };
-	}
+    public float getBottom() {
+        return (float) this.getMaxY();
+    }
 
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		String s = super.toString();
-		sb.append(s.substring(0, s.length() - 1));
-		sb.append(String.format(",bottom=%f,right=%f]", this.getBottom(), this.getRight()));
-		return sb.toString();
-	}
+    public void setBottom(float bottom) {
+        this.setRect(this.x, this.y, this.width, bottom - this.y);
+    }
 
-	/**
-	 * @param rectangles
-	 * @return minimum bounding box that contains all the rectangles
-	 */
-	public static Rectangle boundingBoxOf(List<? extends Rectangle> rectangles) {
-		float minx = java.lang.Float.MAX_VALUE;
-		float miny = java.lang.Float.MAX_VALUE;
-		float maxx = java.lang.Float.MIN_VALUE;
-		float maxy = java.lang.Float.MIN_VALUE;
+    public Point2D[] getPoints() {
+        return new Point2D[]{new Point2D.Float(this.getLeft(), this.getTop()),
+                new Point2D.Float(this.getRight(), this.getTop()), new Point2D.Float(this.getRight(), this.getBottom()),
+                new Point2D.Float(this.getLeft(), this.getBottom())};
+    }
 
-		for (Rectangle r : rectangles) {
-			minx = (float) Math.min(r.getMinX(), minx);
-			miny = (float) Math.min(r.getMinY(), miny);
-			maxx = (float) Math.max(r.getMaxX(), maxx);
-			maxy = (float) Math.max(r.getMaxY(), maxy);
-		}
-		return new Rectangle(miny, minx, maxx - minx, maxy - miny);
-	}
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        String s = super.toString();
+        sb.append(s.substring(0, s.length() - 1));
+        sb.append(String.format(",bottom=%f,right=%f]", this.getBottom(), this.getRight()));
+        return sb.toString();
+    }
 
 }

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

@@ -1,12 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
 import org.locationtech.jts.geom.Envelope;
 import org.locationtech.jts.index.strtree.STRtree;
 
-import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
+import java.util.ArrayList;
+import java.util.List;
 
 @SuppressWarnings("all")
 public class RectangleSpatialIndex<T extends Rectangle> {

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

@@ -1,20 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
+import com.iqser.red.service.redaction.v1.server.tableextraction.utils.CohenSutherlandClipping;
+import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
+import lombok.extern.slf4j.Slf4j;
+
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Formatter;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import com.iqser.red.service.redaction.v1.server.tableextraction.utils.CohenSutherlandClipping;
-import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
-
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
 
 
 @Slf4j
@@ -23,231 +16,10 @@ public class Ruling extends Line2D.Float {
 
     private static int PERPENDICULAR_PIXEL_EXPAND_AMOUNT = 2;
 
-    private enum SOType {VERTICAL, HRIGHT, HLEFT}
-
-
     public Ruling(Point2D p1, Point2D p2) {
         super(p1, p2);
     }
 
-    public boolean vertical() {
-        return this.length() > 0 && Utils.feq(this.x1, this.x2); //diff < ORIENTATION_CHECK_THRESHOLD;
-    }
-
-    public boolean horizontal() {
-        return this.length() > 0 && Utils.feq(this.y1, this.y2); //diff < ORIENTATION_CHECK_THRESHOLD;
-    }
-
-    public boolean oblique() {
-        return !(this.vertical() || this.horizontal());
-    }
-
-    // attributes that make sense only for non-oblique lines
-    // these are used to have a single collapse method (in page, currently)
-
-    public float getPosition() {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        return this.vertical() ? this.getLeft() : this.getTop();
-    }
-
-
-    public float getStart() {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        return this.vertical() ? this.getTop() : this.getLeft();
-    }
-
-    public void setStart(float v) {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        if (this.vertical()) {
-            this.setTop(v);
-        } else {
-            this.setLeft(v);
-        }
-    }
-
-    public float getEnd() {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        return this.vertical() ? this.getBottom() : this.getRight();
-    }
-
-    public void setEnd(float v) {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        if (this.vertical()) {
-            this.setBottom(v);
-        } else {
-            this.setRight(v);
-        }
-    }
-
-    public void setStartEnd(float start, float end) {
-        if (this.oblique()) {
-            throw new UnsupportedOperationException();
-        }
-        if (this.vertical()) {
-            this.setTop(start);
-            this.setBottom(end);
-        } else {
-            this.setLeft(start);
-            this.setRight(end);
-        }
-    }
-
-
-    public boolean perpendicularTo(Ruling other) {
-        return this.vertical() == other.horizontal();
-    }
-
-
-    public boolean nearlyIntersects(Ruling another, int colinearOrParallelExpandAmount) {
-        if (this.intersectsLine(another)) {
-            return true;
-        }
-
-        boolean rv = false;
-
-        if (this.perpendicularTo(another)) {
-            rv = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT).intersectsLine(another);
-        } else {
-            rv = this.expand(colinearOrParallelExpandAmount)
-                    .intersectsLine(another.expand(colinearOrParallelExpandAmount));
-        }
-
-        return rv;
-    }
-
-    public double length() {
-        return Math.sqrt(Math.pow(this.x1 - this.x2, 2) + Math.pow(this.y1 - this.y2, 2));
-    }
-
-    public Ruling intersect(Rectangle2D clip) {
-        Float clipee = (Float) this.clone();
-        boolean clipped = new CohenSutherlandClipping(clip).clip(clipee);
-
-        if (clipped) {
-            return new Ruling(clipee.getP1(), clipee.getP2());
-        } else {
-            return this;
-        }
-    }
-
-    public Ruling expand(float amount) {
-        Ruling r = (Ruling) this.clone();
-        r.setStart(this.getStart() - amount);
-        r.setEnd(this.getEnd() + amount);
-        return r;
-    }
-
-    public Point2D intersectionPoint(Ruling other) {
-        Ruling this_l = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
-        Ruling other_l = other.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
-        Ruling horizontal, vertical;
-
-        if (!this_l.intersectsLine(other_l)) {
-            return null;
-        }
-
-        if (this_l.horizontal() && other_l.vertical()) {
-            horizontal = this_l;
-            vertical = other_l;
-        } else if (this_l.vertical() && other_l.horizontal()) {
-            vertical = this_l;
-            horizontal = other_l;
-        } else {
-            log.warn("lines must be orthogonal, vertical and horizontal");
-            return null;
-        }
-        return new Point2D.Float(vertical.getLeft(), horizontal.getTop());
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-
-        if (!(other instanceof Ruling)) {
-            return false;
-        }
-
-        Ruling o = (Ruling) other;
-        return this.getP1().equals(o.getP1()) && this.getP2().equals(o.getP2());
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode();
-    }
-
-    public float getTop() {
-        return this.y1;
-    }
-
-    public void setTop(float v) {
-        setLine(this.getLeft(), v, this.getRight(), this.getBottom());
-    }
-
-    public float getLeft() {
-        return this.x1;
-    }
-
-    public void setLeft(float v) {
-        setLine(v, this.getTop(), this.getRight(), this.getBottom());
-    }
-
-    public float getBottom() {
-        return this.y2;
-    }
-
-    public void setBottom(float v) {
-        setLine(this.getLeft(), this.getTop(), this.getRight(), v);
-    }
-
-    public float getRight() {
-        return this.x2;
-    }
-
-    public void setRight(float v) {
-        setLine(this.getLeft(), this.getTop(), v, this.getBottom());
-    }
-
-    public float getWidth() {
-        return this.getRight() - this.getLeft();
-    }
-
-    public float getHeight() {
-        return this.getBottom() - this.getTop();
-    }
-
-    public double getAngle() {
-        double angle = Math.toDegrees(Math.atan2(this.getP2().getY() - this.getP1().getY(),
-                this.getP2().getX() - this.getP1().getX()));
-
-        if (angle < 0) {
-            angle += 360;
-        }
-        return angle;
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        Formatter formatter = new Formatter(sb);
-        String rv = formatter.format("%s[minX=%f minY=%f maxX=%f maxY=%f]", this.getClass().toString(), this.x1, this.y1, this.x2, this.y2).toString();
-        formatter.close();
-        return rv;
-    }
-
     public static List<Ruling> cropRulingsToArea(List<Ruling> rulings, Rectangle2D area) {
         ArrayList<Ruling> rv = new ArrayList<>();
         for (Ruling r : rulings) {
@@ -346,7 +118,7 @@ public class Ruling extends Line2D.Float {
                             rv.put(i,
                                     new Ruling[]{h.getKey().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT),
                                             so.ruling.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT)});
-                        } catch(UnsupportedOperationException e){
+                        } catch (UnsupportedOperationException e) {
                             log.info("Some line are oblique, ignoring...");
                             continue;
                         }
@@ -365,5 +137,225 @@ public class Ruling extends Line2D.Float {
 
     }
 
+    public boolean vertical() {
+        return this.length() > 0 && Utils.feq(this.x1, this.x2); //diff < ORIENTATION_CHECK_THRESHOLD;
+    }
+
+    public boolean horizontal() {
+        return this.length() > 0 && Utils.feq(this.y1, this.y2); //diff < ORIENTATION_CHECK_THRESHOLD;
+    }
+
+    // attributes that make sense only for non-oblique lines
+    // these are used to have a single collapse method (in page, currently)
+
+    public boolean oblique() {
+        return !(this.vertical() || this.horizontal());
+    }
+
+    public float getPosition() {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        return this.vertical() ? this.getLeft() : this.getTop();
+    }
+
+    public float getStart() {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        return this.vertical() ? this.getTop() : this.getLeft();
+    }
+
+    public void setStart(float v) {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        if (this.vertical()) {
+            this.setTop(v);
+        } else {
+            this.setLeft(v);
+        }
+    }
+
+    public float getEnd() {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        return this.vertical() ? this.getBottom() : this.getRight();
+    }
+
+    public void setEnd(float v) {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        if (this.vertical()) {
+            this.setBottom(v);
+        } else {
+            this.setRight(v);
+        }
+    }
+
+    public void setStartEnd(float start, float end) {
+        if (this.oblique()) {
+            throw new UnsupportedOperationException();
+        }
+        if (this.vertical()) {
+            this.setTop(start);
+            this.setBottom(end);
+        } else {
+            this.setLeft(start);
+            this.setRight(end);
+        }
+    }
+
+    public boolean perpendicularTo(Ruling other) {
+        return this.vertical() == other.horizontal();
+    }
+
+    public boolean nearlyIntersects(Ruling another, int colinearOrParallelExpandAmount) {
+        if (this.intersectsLine(another)) {
+            return true;
+        }
+
+        boolean rv = false;
+
+        if (this.perpendicularTo(another)) {
+            rv = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT).intersectsLine(another);
+        } else {
+            rv = this.expand(colinearOrParallelExpandAmount)
+                    .intersectsLine(another.expand(colinearOrParallelExpandAmount));
+        }
+
+        return rv;
+    }
+
+    public double length() {
+        return Math.sqrt(Math.pow(this.x1 - this.x2, 2) + Math.pow(this.y1 - this.y2, 2));
+    }
+
+    public Ruling intersect(Rectangle2D clip) {
+        Float clipee = (Float) this.clone();
+        boolean clipped = new CohenSutherlandClipping(clip).clip(clipee);
+
+        if (clipped) {
+            return new Ruling(clipee.getP1(), clipee.getP2());
+        } else {
+            return this;
+        }
+    }
+
+    public Ruling expand(float amount) {
+        Ruling r = (Ruling) this.clone();
+        try {
+            r.setStart(this.getStart() - amount);
+            r.setEnd(this.getEnd() + amount);
+        } catch (UnsupportedOperationException e){
+            log.warn("Could not expand ruling!");
+        }
+        return r;
+    }
+
+    public Point2D intersectionPoint(Ruling other) {
+        Ruling this_l = this.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
+        Ruling other_l = other.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT);
+        Ruling horizontal, vertical;
+
+        if (!this_l.intersectsLine(other_l)) {
+            return null;
+        }
+
+        if (this_l.horizontal() && other_l.vertical()) {
+            horizontal = this_l;
+            vertical = other_l;
+        } else if (this_l.vertical() && other_l.horizontal()) {
+            vertical = this_l;
+            horizontal = other_l;
+        } else {
+            log.warn("lines must be orthogonal, vertical and horizontal");
+            return null;
+        }
+        return new Point2D.Float(vertical.getLeft(), horizontal.getTop());
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof Ruling)) {
+            return false;
+        }
+
+        Ruling o = (Ruling) other;
+        return this.getP1().equals(o.getP1()) && this.getP2().equals(o.getP2());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    public float getTop() {
+        return this.y1;
+    }
+
+    public void setTop(float v) {
+        setLine(this.getLeft(), v, this.getRight(), this.getBottom());
+    }
+
+    public float getLeft() {
+        return this.x1;
+    }
+
+    public void setLeft(float v) {
+        setLine(v, this.getTop(), this.getRight(), this.getBottom());
+    }
+
+    public float getBottom() {
+        return this.y2;
+    }
+
+    public void setBottom(float v) {
+        setLine(this.getLeft(), this.getTop(), this.getRight(), v);
+    }
+
+    public float getRight() {
+        return this.x2;
+    }
+
+    public void setRight(float v) {
+        setLine(this.getLeft(), this.getTop(), v, this.getBottom());
+    }
+
+    public float getWidth() {
+        return this.getRight() - this.getLeft();
+    }
+
+    public float getHeight() {
+        return this.getBottom() - this.getTop();
+    }
+
+    public double getAngle() {
+        double angle = Math.toDegrees(Math.atan2(this.getP2().getY() - this.getP1().getY(),
+                this.getP2().getX() - this.getP1().getX()));
+
+        if (angle < 0) {
+            angle += 360;
+        }
+        return angle;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        Formatter formatter = new Formatter(sb);
+        String rv = formatter.format("%s[minX=%f minY=%f maxX=%f maxY=%f]", this.getClass().toString(), this.x1, this.y1, this.x2, this.y2).toString();
+        formatter.close();
+        return rv;
+    }
+
+    private enum SOType {VERTICAL, HRIGHT, HLEFT}
+
 
 }

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

@@ -1,22 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.model;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.*;
 
 @Slf4j
 public class Table extends AbstractTextContainer {
@@ -24,21 +15,14 @@ public class Table extends AbstractTextContainer {
     private final TreeMap<CellPosition, Cell> cells = new TreeMap<>();
 
     private final RectangleSpatialIndex<Cell> si = new RectangleSpatialIndex<>();
-
+    private final int rotation;
     @Getter
     @Setter
     private String headline;
-
     private int unrotatedRowCount;
-
     private int unrotatedColCount;
-
     private int rowCount = -1;
-
     private int colCount = -1;
-
-    private final int rotation;
-
     private List<List<Cell>> rows;
 
 
@@ -62,8 +46,8 @@ public class Table extends AbstractTextContainer {
 
             // Ignore rows that does not contain any cells and values.
             List<List<Cell>> rowsToRemove = new ArrayList<>();
-            for (List<Cell> row: rows){
-                if (row.size() == 1 && row.get(0).getTextBlocks().isEmpty()){
+            for (List<Cell> row : rows) {
+                if (row.size() == 1 && row.get(0).getTextBlocks().isEmpty()) {
                     rowsToRemove.add(row);
                 }
             }
@@ -110,6 +94,10 @@ public class Table extends AbstractTextContainer {
         // we move from left to right and top to bottom
         for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
             List<Cell> rowCells = rows.get(rowIndex);
+            if (rowCells.size() == 1) {
+                continue;
+            }
+
             for (int colIndex = 0; colIndex < rowCells.size(); colIndex++) {
                 Cell cell = rowCells.get(colIndex);
                 List<Cell> cellsToTheLeft = rowCells.subList(0, colIndex);
@@ -271,7 +259,7 @@ public class Table extends AbstractTextContainer {
 
         cells.sort(Collections.reverseOrder((arg0, arg1) -> Float.compare(Utils.round(arg0.getBottom(), 2),
                 Utils.round(arg1
-                .getBottom(), 2))));
+                        .getBottom(), 2))));
 
         Iterator<Cell> iter = cells.iterator();
         Cell c = iter.next();
@@ -363,4 +351,4 @@ public class Table extends AbstractTextContainer {
         return sb.toString();
     }
 
-}
+}

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

@@ -1,26 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.service;
 
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
 import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
+import org.springframework.stereotype.Service;
+
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.util.*;
 
 @Service
 public class RulingCleaningService {
 
-    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth){
+    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth, float maxCharHeight) {
+
         if (!rulings.isEmpty()) {
-            snapPoints(rulings, minCharWidth , minCharWidth);
+            snapPoints(rulings, minCharWidth, maxCharHeight);
         }
 
         List<Ruling> vrs = new ArrayList<>();
@@ -39,13 +34,10 @@ public class RulingCleaningService {
         }
         List<Ruling> horizontalRulingLines = collapseOrientedRulings(hrs);
 
-        return CleanRulings
-                .builder()
-                .vertical(verticalRulingLines)
-                .horizontal(horizontalRulingLines)
-                .build();
+        return CleanRulings.builder().vertical(verticalRulingLines).horizontal(horizontalRulingLines).build();
     }
 
+
     public void snapPoints(List<? extends Line2D.Float> rulings, float xThreshold, float yThreshold) {
 
         // collect points and keep a Line -> p1,p2 map
@@ -122,12 +114,14 @@ public class RulingCleaningService {
 
 
     private List<Ruling> collapseOrientedRulings(List<Ruling> lines) {
+
         int COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT = 1;
         return collapseOrientedRulings(lines, COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT);
     }
 
 
     private List<Ruling> collapseOrientedRulings(List<Ruling> lines, int expandAmount) {
+
         ArrayList<Ruling> rv = new ArrayList<>();
         lines.sort((a, b) -> {
             final float diff = a.getPosition() - b.getPosition();
@@ -141,25 +135,24 @@ public class RulingCleaningService {
                 final float lastStart = last.getStart();
                 final float lastEnd = last.getEnd();
 
-                final boolean lastFlipped = lastStart            > lastEnd;
+                final boolean lastFlipped = lastStart > lastEnd;
                 final boolean nextFlipped = next_line.getStart() > next_line.getEnd();
 
                 boolean differentDirections = nextFlipped != lastFlipped;
-                float nextS = differentDirections ? next_line.getEnd()   : next_line.getStart();
+                float nextS = differentDirections ? next_line.getEnd() : next_line.getStart();
                 float nextE = differentDirections ? next_line.getStart() : next_line.getEnd();
 
                 final float newStart = lastFlipped ? Math.max(nextS, lastStart) : Math.min(nextS, lastStart);
-                final float newEnd   = lastFlipped ? Math.min(nextE, lastEnd)   : Math.max(nextE, lastEnd);
+                final float newEnd = lastFlipped ? Math.min(nextE, lastEnd) : Math.max(nextE, lastEnd);
                 last.setStartEnd(newStart, newEnd);
                 assert !last.oblique();
-            }
-            else if (next_line.length() == 0) {
+            } else if (next_line.length() == 0) {
                 continue;
-            }
-            else {
+            } else {
                 rv.add(next_line);
             }
         }
         return rv;
     }
+
 }

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

@@ -1,31 +1,57 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.service;
 
-import java.awt.geom.Point2D;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.springframework.stereotype.Service;
-
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-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.CleanRulings;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.*;
 import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
+import org.springframework.stereotype.Service;
+
+import java.awt.geom.Point2D;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class TableExtractionService {
 
+    private static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (arg0, arg1) -> {
+
+        int rv = 0;
+        float arg0X = Utils.round(arg0.getX(), 2);
+        float arg0Y = Utils.round(arg0.getY(), 2);
+        float arg1X = Utils.round(arg1.getX(), 2);
+        float arg1Y = Utils.round(arg1.getY(), 2);
+
+        if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
+        } else if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
+        }
+        return rv;
+    };
+    private static final Comparator<Point2D> POINT_COMPARATOR = (arg0, arg1) -> {
+
+        int rv = 0;
+        float arg0X = Utils.round(arg0.getX(), 2);
+        float arg0Y = Utils.round(arg0.getY(), 2);
+        float arg1X = Utils.round(arg1.getX(), 2);
+        float arg1Y = Utils.round(arg1.getY(), 2);
+
+        if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
+        } else if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
+        }
+        return rv;
+    };
+
     public void extractTables(CleanRulings cleanRulings, Page page) {
 
         List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());
@@ -80,7 +106,6 @@ public class TableExtractionService {
         page.getTextBlocks().removeAll(toBeRemoved);
     }
 
-
     public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
 
         List<Cell> cellsFound = new ArrayList<>();
@@ -133,7 +158,6 @@ public class TableExtractionService {
         return cellsFound;
     }
 
-
     private List<Rectangle> findSpreadsheetsFromCells(List<? extends Rectangle> cells) {
         // via: http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
         List<Rectangle> rectangles = new ArrayList<>();
@@ -233,47 +257,6 @@ public class TableExtractionService {
         return rectangles;
     }
 
-
-    private static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (arg0, arg1) -> {
-
-        int rv = 0;
-        float arg0X = Utils.round(arg0.getX(), 2);
-        float arg0Y = Utils.round(arg0.getY(), 2);
-        float arg1X = Utils.round(arg1.getX(), 2);
-        float arg1Y = Utils.round(arg1.getY(), 2);
-
-        if (arg0X > arg1X) {
-            rv = 1;
-        } else if (arg0X < arg1X) {
-            rv = -1;
-        } else if (arg0Y > arg1Y) {
-            rv = 1;
-        } else if (arg0Y < arg1Y) {
-            rv = -1;
-        }
-        return rv;
-    };
-
-    private static final Comparator<Point2D> POINT_COMPARATOR = (arg0, arg1) -> {
-
-        int rv = 0;
-        float arg0X = Utils.round(arg0.getX(), 2);
-        float arg0Y = Utils.round(arg0.getY(), 2);
-        float arg1X = Utils.round(arg1.getX(), 2);
-        float arg1Y = Utils.round(arg1.getY(), 2);
-
-        if (arg0Y > arg1Y) {
-            rv = 1;
-        } else if (arg0Y < arg1Y) {
-            rv = -1;
-        } else if (arg0X > arg1X) {
-            rv = 1;
-        } else if (arg0X < arg1X) {
-            rv = -1;
-        }
-        return rv;
-    };
-
     private enum Direction {
         HORIZONTAL, VERTICAL
     }

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

@@ -19,21 +19,24 @@ import java.awt.geom.Rectangle2D;
  * clipping algorithm (line against clip rectangle).
  */
 @SuppressWarnings("all")
-public final class CohenSutherlandClipping
-{
+public final class CohenSutherlandClipping {
+    private static final int INSIDE = 0;
+    private static final int LEFT = 1;
+    private static final int RIGHT = 2;
+    private static final int BOTTOM = 4;
+    private static final int TOP = 8;
     private double xMin;
     private double yMin;
     private double xMax;
     private double yMax;
-
     /**
      * Creates a Cohen Sutherland clipper with clip rect (0, 0, 0, 0).
      */
     public CohenSutherlandClipping() {
     }
-
     /**
      * Creates a Cohen Sutherland clipper with the given clip rectangle.
+     *
      * @param clip the clip rectangle to use
      */
     public CohenSutherlandClipping(Rectangle2D clip) {
@@ -42,6 +45,7 @@ public final class CohenSutherlandClipping
 
     /**
      * Sets the clip rectangle.
+     *
      * @param clip the clip rectangle
      */
     public void setClip(Rectangle2D clip) {
@@ -51,19 +55,13 @@ public final class CohenSutherlandClipping
         yMax = yMin + clip.getHeight();
     }
 
-    private static final int INSIDE = 0;
-    private static final int LEFT   = 1;
-    private static final int RIGHT  = 2;
-    private static final int BOTTOM = 4;
-    private static final int TOP    = 8;
-
     private final int regionCode(double x, double y) {
-        int code = x < xMin 
-            ? LEFT
-            : x > xMax
+        int code = x < xMin
+                ? LEFT
+                : x > xMax
                 ? RIGHT
                 : INSIDE;
-             if (y < yMin) code |= BOTTOM;
+        if (y < yMin) code |= BOTTOM;
         else if (y > yMax) code |= TOP;
         return code;
     }
@@ -71,6 +69,7 @@ public final class CohenSutherlandClipping
     /**
      * Clips a given line against the clip rectangle.
      * The modification (if needed) is done in place.
+     *
      * @param line the line to clip
      * @return true if line is clipped, false if line is
      * totally outside the clip rect.
@@ -87,9 +86,9 @@ public final class CohenSutherlandClipping
 
         boolean vertical = p1x == p2x;
 
-        double slope = vertical 
-            ? 0d
-            : (p2y-p1y)/(p2x-p1x);
+        double slope = vertical
+                ? 0d
+                : (p2y - p1y) / (p2x - p1x);
 
         int c1 = regionCode(p1x, p1y);
         int c2 = regionCode(p2x, p2y);
@@ -103,31 +102,27 @@ public final class CohenSutherlandClipping
 
             if ((c & LEFT) != INSIDE) {
                 qx = xMin;
-                qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*slope + p1y;
-            }
-            else if ((c & RIGHT) != INSIDE) {
+                qy = (Utils.feq(qx, p1x) ? 0 : qx - p1x) * slope + p1y;
+            } else if ((c & RIGHT) != INSIDE) {
                 qx = xMax;
-                qy = (Utils.feq(qx, p1x) ? 0 : qx-p1x)*slope + p1y;
-            }
-            else if ((c & BOTTOM) != INSIDE) {
+                qy = (Utils.feq(qx, p1x) ? 0 : qx - p1x) * slope + p1y;
+            } else if ((c & BOTTOM) != INSIDE) {
                 qy = yMin;
                 qx = vertical
-                    ? p1x
-                    : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/slope + p1x;
-            }
-            else if ((c & TOP) != INSIDE) {
+                        ? p1x
+                        : (Utils.feq(qy, p1y) ? 0 : qy - p1y) / slope + p1x;
+            } else if ((c & TOP) != INSIDE) {
                 qy = yMax;
                 qx = vertical
-                    ? p1x
-                    : (Utils.feq(qy, p1y) ? 0 : qy-p1y)/slope + p1x;
+                        ? p1x
+                        : (Utils.feq(qy, p1y) ? 0 : qy - p1y) / slope + p1x;
             }
 
             if (c == c1) {
                 p1x = qx;
                 p1y = qy;
-                c1  = regionCode(p1x, p1y);
-            }
-            else {
+                c1 = regionCode(p1x, p1y);
+            } else {
                 p2x = qx;
                 p2y = qy;
                 c2 = regionCode(p2x, p2y);
@@ -137,4 +132,4 @@ public final class CohenSutherlandClipping
         return true;
     }
 }
-// end of file
+// end of file

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

@@ -10,11 +10,6 @@ import java.util.List;
  */
 public final class QuickSort {
 
-    private QuickSort() {
-
-    }
-
-
     private static final Comparator<? extends Comparable> OBJCOMP = new Comparator<Comparable>() {
         @Override
         public int compare(Comparable object1, Comparable object2) {
@@ -24,6 +19,10 @@ public final class QuickSort {
     };
 
 
+    private QuickSort() {
+
+    }
+
     /**
      * Sorts the given list using the given comparator.
      *

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

@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.utils;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.math.BigDecimal;
 import java.util.Comparator;
 import java.util.List;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @SuppressWarnings("all")
 public class Utils {

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

@@ -1,15 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.visualization.service;
 
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.springframework.stereotype.Service;
-
 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.model.Paragraph;
@@ -17,9 +7,17 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.springframework.stereotype.Service;
+
+import java.awt.Color;
+import java.io.IOException;
+import java.util.List;
 
 @Slf4j
 @Service
@@ -34,7 +32,7 @@ public class PdfVisualisationService {
             PDPage pdPage = document.getPage(page - 1);
             PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
 
-            for(Paragraph paragraph : classifiedDoc.getParagraphs()) {
+            for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
 
                 for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
 
@@ -44,10 +42,10 @@ public class PdfVisualisationService {
                         continue;
                     }
                     if (textBlock instanceof TextBlock) {
-                        textBlock.setClassification((i+1) + "/" + paragraph.getPageBlocks().size());
+                        textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
                         visualizeTextBlock((TextBlock) textBlock, contentStream);
                     } else if (textBlock instanceof Table) {
-                        textBlock.setClassification((i+1) + "/" + paragraph.getPageBlocks().size());
+                        textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
                         visualizeTable((Table) textBlock, contentStream);
                     }
 
@@ -59,7 +57,6 @@ public class PdfVisualisationService {
     }
 
 
-
     public void visualizeClassifications(Document classifiedDoc, PDDocument document) throws IOException {
 
         for (int page = 1; page <= document.getNumberOfPages(); page++) {
@@ -105,7 +102,7 @@ public class PdfVisualisationService {
 
             contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY());
 
-            contentStream.showText(textBlock.getClassification());
+            contentStream.showText(textBlock.getClassification() + textBlock.getOrientation());
 
             contentStream.endText();
         }

redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml

@@ -1,4 +1,11 @@
 server:
   port: 8083
 
-configuration-service.url: "http://localhost:8081"
+configuration-service.url: "http://localhost:8081"
+file-management-service.url: "http://localhost:8085"
+
+storage:
+  bucket-name: 'redaction'
+  endpoint: 'http://localhost:9000'
+  key: minioadmin
+  secret: minioadmin