Merge branch 'RED-6929' into 'master'

RED-6929: Fix Acceptance Tests/Rules

Closes RED-6929

See merge request redactmanager/redaction-service!27

.gitlab-ci.yml

@@ -0,0 +1,6 @@
+variables:
+  SONAR_PROJECT_KEY: 'RED_redaction-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/maven_java.yml'

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]

bamboo-specs/pom.xml

@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.atlassian.bamboo</groupId>
-    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
-    <relativePath/>
-  </parent>
-
-  <artifactId>bamboo-specs</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.atlassian.bamboo</groupId>
-      <artifactId>bamboo-specs-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.atlassian.bamboo</groupId>
-      <artifactId>bamboo-specs</artifactId>
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-
-  <!-- run 'mvn test' to perform offline validation of the plan -->
-  <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>

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

@@ -1,137 +0,0 @@
-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;
-import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
-import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
-import com.atlassian.bamboo.specs.api.builders.permission.PlanPermissions;
-import com.atlassian.bamboo.specs.api.builders.plan.Job;
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.builders.plan.PlanIdentifier;
-import com.atlassian.bamboo.specs.api.builders.plan.Stage;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
-import com.atlassian.bamboo.specs.api.builders.project.Project;
-import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
-import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
-import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
-import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
-import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
-import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.util.BambooServer;
-
-/**
- * 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>
- */
-@BambooSpec
-public class PlanSpec {
-
-    private static final String SERVICE_NAME = "redaction-service";
-
-    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
-
-    /**
-     * Run main to publish plan on Bamboo
-     */
-    public static void main(final String[] args) throws Exception {
-        //By default credentials are read from the '.credentials' file.
-        BambooServer bambooServer = new BambooServer("http://localhost:8085");
-
-        Plan plan = new PlanSpec().createPlan();
-        bambooServer.publish(plan);
-        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
-        bambooServer.publish(planPermission);
-    }
-
-    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
-        Permissions permission = new Permissions()
-                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
-                .loggedInUserPermissions(PermissionType.VIEW)
-                .anonymousUserPermissionView();
-        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
-    }
-
-    private Project project() {
-        return new Project()
-                .name("RED")
-                .key(new BambooKey("RED"));
-    }
-
-    public Plan createPlan() {
-        return new Plan(
-                project(),
-                SERVICE_NAME, new BambooKey(SERVICE_KEY))
-                .description("Plan created from (enter repository url of your plan)")
-                .stages(new Stage("Default Stage")
-                        .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" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"),
-                                        new VcsCheckoutTask()
-                                                .description("Checkout Default Repository")
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Build")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\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" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean install -Djava.security.egd=file:/dev/./urandom; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-v1/pom.xml --no-transfer-progress clean deploy -e -DdeployAtEnd=true -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases; fi\n" +
-
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml package\n" +
-                                                        "${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn --no-transfer-progress -f ${bamboo_build_working_directory}/" + SERVICE_NAME + "-image-v1/pom.xml docker:push\n" +
-
-                                                        "if [[ \"${bamboo.version_tag}\" = \"dev\" ]]; then echo \"gitTag=${bamboo.planRepository.1.branch}_${bamboo.buildNumber}\" > git.tag; fi\n" +
-                                                        "if [[ \"${bamboo.version_tag}\" != \"dev\" ]]; then echo \"gitTag=${bamboo.version_tag}\" > git.tag; fi\n"),
-                                        createJUnitParserTask()
-                                                .description("Resultparser")
-                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                                .enabled(true),
-                                        new InjectVariablesTask()
-                                                .description("Inject git Tag")
-                                                .path("git.tag")
-                                                .namespace("g")
-                                                .scope(InjectVariablesScope.LOCAL),
-                                        new VcsTagTask()
-                                                .description("${bamboo.g.gitTag}")
-                                                .tagName("${bamboo.g.gitTag}")
-                                                .defaultRepository())
-                                .dockerConfiguration(
-                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
-                .linkedRepositories("RED / " + SERVICE_NAME)
-
-                .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranch()
-                        .delete(new BranchCleanup()
-                                .whenInactiveInRepositoryAfterDays(14))
-                        .notificationForCommitters());
-    }
-}

bamboo-specs/src/test/java/buildjob/PlanSpecTest.java

@@ -1,17 +0,0 @@
-package buildjob;
-
-
-import org.junit.Test;
-
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.exceptions.PropertiesValidationException;
-import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
-
-public class PlanSpecTest {
-    @Test
-    public void checkYourPlanOffline() throws PropertiesValidationException {
-        Plan plan = new PlanSpec().createPlan();
-
-        EntityPropertiesBuilders.build(plan);
-    }
-}

pom.xml

@@ -7,15 +7,14 @@
 
     <artifactId>redaction-service</artifactId>
     <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>
 
 
     <packaging>pom</packaging>
 
     <modules>
-        <module>bamboo-specs</module>
         <module>redaction-service-v1</module>
         <module>redaction-service-image-v1</module>
     </modules>
 
-</project>
+</project>

redaction-service-image-v1/pom.xml

@@ -3,15 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.iqser.red</groupId>
+        <groupId>com.knecon.fforesight</groupId>
         <artifactId>platform-docker-dependency</artifactId>
-        <version>1.0.0</version>
+        <version>0.1.0</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>redaction-service-image-v1</artifactId>
     <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -41,7 +42,7 @@
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -94,4 +95,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
+</project>

redaction-service-image-v1/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM red/base-image:1.0.0
+FROM red/redaction-service-base-v1:2.0.0
 
 ARG PLATFORM_JAR
 
@@ -7,12 +7,3 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 ENV USES_ELASTICSEARCH false
 
 COPY ["${PLATFORM_JAR}", "/"]
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    wget cabextract xfonts-utils fonts-liberation \
- && rm -rf /var/lib/apt/lists/*
-
-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \

redaction-service-v1/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.0.2</version>
+        <version>2.2.0</version>
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>redaction-service-v1</artifactId>
     <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-
+    <version>4.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -22,21 +22,20 @@
     </modules>
 
     <properties>
-        <pdfbox.version>2.0.21</pdfbox.version>
+        <pdfbox.version>2.0.24</pdfbox.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 
     <dependencyManagement>
-
         <dependencies>
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.1.0</version>
+                <version>2.1.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
@@ -47,9 +46,69 @@
                 <artifactId>pdfbox-tools</artifactId>
                 <version>${pdfbox.version}</version>
             </dependency>
-
         </dependencies>
-
     </dependencyManagement>
 
-</project>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                </plugin>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <configuration>
+                        <format>ALL</format>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.8</version>
+                    <configuration>
+                        <excludes>
+                            <exclude>org/drools/**/*</exclude>
+                        </excludes>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok-maven-plugin</artifactId>
+                <version>1.18.20.0</version>
+                <executions>
+                    <execution>
+                        <id>delombok</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>delombok</goal>
+                        </goals>
+                        <configuration>
+                            <addOutputDirectory>false</addOutputDirectory>
+                            <sourceDirectory>src/main/java</sourceDirectory>
+                            <outputDirectory>${delomboked.sources}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -6,16 +6,56 @@
     <parent>
         <artifactId>redaction-service-v1</artifactId>
         <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>redaction-service-api-v1</artifactId>
 
+    <properties>
+        <persistence-service.version>2.93.0</persistence-service.version>
+    </properties>
+
     <dependencies>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>persistence-service-internal-api-v1</artifactId>
+            <version>${persistence-service.version}</version>
+            <exclusions>
+
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>persistence-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -5,11 +5,11 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-public class Point {
+@AllArgsConstructor
+public class Argument {
 
-    private float x;
-    private float y;
+    private String name;
+    private ArgumentType type;
 
 }

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

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ArgumentType {
+
+    INTEGER,
+    BOOLEAN,
+    STRING,
+    FILE_ATTRIBUTE,
+    REGEX,
+    TYPE,
+    RULE_NUMBER,
+    LEGAL_BASIS,
+    REFERENCE_TYPE
+
+}

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

@@ -1,16 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CellRectangle {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-
-}

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

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

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

@@ -1,30 +0,0 @@
-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;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactionEntry {
-
-    private String id;
-    private String user;
-    private String type;
-    private String value;
-    private String reason;
-    private String legalBasis;
-    private List<Rectangle> positions = new ArrayList<>();
-    private Status status;
-    private boolean addToDictionary;
-
-    private String section;
-    private int sectionNumber;
-
-}

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

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

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

@@ -1,29 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactions {
-
-    @Builder.Default
-    private Set<IdRemoval> idsToRemove = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}

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

@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Rectangle {
-
-    private Point topLeft;
-    private float width;
-    private float height;
-
-    private int page;
-}

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

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

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

@@ -1,40 +0,0 @@
-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;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionLogEntry {
-
-    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;
-
-}

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

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class RuleBuilderModel {
+
+    private List<RuleElement> whenClauses = new ArrayList<>();
+    private List<RuleElement> thenConditions = new ArrayList<>();
+
+}

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

@@ -1,18 +1,18 @@
 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;
 
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SectionGrid {
+import java.util.ArrayList;
+import java.util.List;
 
-    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleElement {
+
+    private String conditionName;
+    private List<Argument> arguments = new ArrayList<>();
 
 }

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

@@ -1,33 +0,0 @@
-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;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@RequiredArgsConstructor
-public class SectionRectangle {
-
-    @NonNull
-    private Point topLeft;
-
-    @NonNull
-    private float width;
-
-    @NonNull
-    private float height;
-
-    @NonNull
-    private int part;
-
-    @NonNull
-    private int numberOfParts;
-
-    private List<CellRectangle> tableCells;
-}

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

@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}

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

@@ -9,9 +9,10 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RedactionRequest {
+public class StructureAnalyzeRequest {
+
+    private String dossierId;
+    private String fileId;
 
-    private byte[] document;
-    private boolean flatRedaction;
-    private ManualRedactions manualRedactions;
 }
+

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

@@ -4,26 +4,9 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-
 public interface RedactionResource {
 
-    String SERVICE_NAME = "redaction-service-v1";
+    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
+    void testRules(@RequestBody String rules);
 
-    @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult sections(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);
-
-    @PostMapping(value = "/rules/update", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@RequestBody String rules);
-
-}
+}

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

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.resources;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface RuleBuilderResource {
+
+    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
+    RuleBuilderModel getRuleBuilderModel();
+
+}

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

@@ -6,42 +6,98 @@
     <parent>
         <artifactId>redaction-service-v1</artifactId>
         <groupId>com.iqser.red.service</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>redaction-service-server-v1</artifactId>
 
+    <properties>
+        <drools.version>8.37.0.Final</drools.version>
+        <kie.version>7.73.0.Final</kie.version>
+        <locationtech.version>1.19.0</locationtech.version>
+        <javaassist.version>3.29.2-GA</javaassist.version>
+        <ahocorasick.version>0.6.3</ahocorasick.version>
+        <jackson.version>2.14.2</jackson.version>
+        <tennat-commons.version>0.10.0</tennat-commons.version>
+    </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>com.knecon.fforesight</groupId>
+            <artifactId>tenant-commons</artifactId>
+            <version>${tennat-commons.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>dictionary-merge-commons</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>storage-commons</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-afterburner</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ahocorasick</groupId>
+            <artifactId>ahocorasick</artifactId>
+            <version>${ahocorasick.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>${javaassist.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>redaction-service-api-v1</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.3.7</version>
+            <groupId>org.drools</groupId>
+            <artifactId>drools-engine</artifactId>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
-            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <artifactId>drools-mvel</artifactId>
+            <version>${drools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${kie.version}</version>
         </dependency>
         <dependency>
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
-            <version>1.16.1</version>
+            <version>${locationtech.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
         </dependency>
+
         <!-- commons -->
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
@@ -56,10 +112,6 @@
             <artifactId>metric-commons</artifactId>
         </dependency>
         <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>pdfbox</artifactId>
@@ -73,11 +125,12 @@
             <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>
         </dependency>
+
         <!-- test dependencies -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -93,6 +146,21 @@
 
     <build>
         <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <!-- generate git.properties for exposure in /info -->
                 <groupId>pl.project13.maven</groupId>
@@ -146,5 +214,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

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

@@ -1,19 +1,8 @@
 package com.iqser.red.service.redaction.v1.server;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -21,51 +10,39 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+import com.iqser.red.service.dictionarymerge.commons.DictionaryMergeService;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
+import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
 
-@Import({DefaultWebMvcConfiguration.class})
+import io.micrometer.core.aop.TimedAspect;
+import io.micrometer.core.instrument.MeterRegistry;
+
+@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
+@Import({MetricsConfiguration.class, StorageAutoConfiguration.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 {
 
-    @Autowired
-    private RulesClient rulesClient;
-
-
     public static void main(String[] args) {
 
+        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
         SpringApplication.run(Application.class, args);
     }
 
 
     @Bean
-    public KieContainer kieContainer() {
-
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            RulesResponse rules = rulesClient.getRules();
-            if (StringUtils.isEmpty(rules.getRules())) {
-                throw new RuntimeException("Rules cannot be empty.");
-            }
-            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
-                    .newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
+    public TimedAspect timedAspect(MeterRegistry registry) {
 
+        return new TimedAspect(registry);
     }
 
-}
+    @Bean
+    public DictionaryMergeService dictionaryMergeService() {
+
+        return new DictionaryMergeService();
+    }
+
+}

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

@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.iqser.gin4.commons.metrics.MetricCommonsConfiguration;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerFactory;
+import com.iqser.gin4.commons.metrics.meters.FunctionTimerValues;
+
+@Configuration
+@Import({MetricCommonsConfiguration.class})
+public class MetricsConfiguration {
+
+    private static final String REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME = "redactmanager_analyze.pagewise";
+
+
+    @Bean
+    @Qualifier(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME)
+    public FunctionTimerValues redactmanagerAnalyzePagewise(FunctionTimerFactory factory) {
+
+        return factory.create(REDACTMANAGER_ANALYZE_PAGEWISE_METRIC_NAME);
+    }
+
+}

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

@@ -1,32 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-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;
-
-@Data
-@NoArgsConstructor
-public class Document {
-
-    private List<Page> pages = new ArrayList<>();
-    private List<Paragraph> paragraphs = 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 StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
-    private boolean headlines;
-
-    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-    private SectionGrid sectionGrid = new SectionGrid();
-    private long dictionaryVersion;
-    private long rulesVersion;
-}

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

@@ -1,35 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import java.util.List;
-
-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;
-
-@Data
-@RequiredArgsConstructor
-public class Page {
-
-    @NonNull
-    private List<AbstractTextContainer> textBlocks;
-
-    private Rectangle bodyTextFrame;
-
-    private boolean landscape;
-    private int rotation;
-
-    private int pageNumber;
-
-    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
-    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
-    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,56 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.redaction.model.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 {
-
-    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
-    private String headline;
-
-
-    public SearchableText getSearchableText() {
-
-        SearchableText searchableText = new SearchableText();
-        pageBlocks.forEach(block -> {
-            if (block instanceof TextBlock) {
-                searchableText.addAll(((TextBlock) block).getSequences());
-            }
-        });
-        return searchableText;
-    }
-
-
-    public List<Table> getTables() {
-
-        List<Table> tables = new ArrayList<>();
-        pageBlocks.forEach(block -> {
-            if (block instanceof Table) {
-                tables.add((Table) block);
-            }
-        });
-        return tables;
-    }
-
-
-    public List<TextBlock> getTextBlocks() {
-
-        List<TextBlock> textBlocks = new ArrayList<>();
-        pageBlocks.forEach(block -> {
-            if (block instanceof TextBlock) {
-                textBlocks.add((TextBlock) block);
-            }
-        });
-        return textBlocks;
-    }
-
-}

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

@@ -1,142 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.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
-public class TextBlock extends AbstractTextContainer {
-
-    @Builder.Default
-    private List<TextPositionSequence> sequences = new ArrayList<>();
-    private int rotation;
-
-    private String mostPopularWordFont;
-    private String mostPopularWordStyle;
-    private float mostPopularWordFontSize;
-    private float mostPopularWordHeight;
-    private float mostPopularWordSpaceWidth;
-
-    private float highestFontSize;
-
-    private String classification;
-
-    public TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
-        this.minX = minX;
-        this.maxX = maxX;
-        this.minY = minY;
-        this.maxY = maxY;
-        this.sequences = sequences;
-        this.rotation = rotation;
-    }
-
-    public TextBlock union(TextPositionSequence r) {
-        TextBlock union = this.copy();
-        union.add(r);
-        return union;
-    }
-
-    public TextBlock union(TextBlock r) {
-        TextBlock union = this.copy();
-        union.add(r);
-        return union;
-    }
-
-    public void add(TextBlock r) {
-        if (r.getMinX() < minX) {
-            minX = r.getMinX();
-        }
-        if (r.getMaxX() > maxX) {
-            maxX = r.getMaxX();
-        }
-        if (r.getMinY() < minY) {
-            minY = r.getMinY();
-        }
-        if (r.getMaxY() > maxY) {
-            maxY = r.getMaxY();
-        }
-        sequences.addAll(r.getSequences());
-    }
-
-    public void add(TextPositionSequence r) {
-        if (r.getX1() < minX) {
-            minX = r.getX1();
-        }
-        if (r.getX2() > maxX) {
-            maxX = r.getX2();
-        }
-        if (r.getY1() < minY) {
-            minY = r.getY1();
-        }
-        if (r.getY2() > maxY) {
-            maxY = r.getY2();
-        }
-    }
-
-    public TextBlock copy() {
-        return new TextBlock(minX, maxX, minY, maxY, sequences, rotation);
-    }
-
-    public void resize(float x1, float y1, float width, float height) {
-        set(x1, y1, x1 + width, y1 + height);
-    }
-
-    public void set(float x1, float y1, float x2, float y2) {
-        this.minX = Math.min(x1, x2);
-        this.maxX = Math.max(x1, x2);
-        this.minY = Math.min(y1, y2);
-        this.maxY = Math.max(y1, y2);
-    }
-
-
-
-    @Override
-    public String toString() {
-
-        StringBuilder builder = new StringBuilder();
-
-        for (int i = 0; i < sequences.size(); i++) {
-            String sequenceAsString = sequences.get(i).toString();
-            // Fix for missing Whitespace. This is recognized in getSequences method. See PDFTextStripper Line 1730.
-            if (i != 0 && sequences.get(i - 1).charAt(sequences.get(i - 1).length() - 1) != ' ' && sequenceAsString.charAt(0) != ' ') {
-                builder.append(' ');
-            }
-            builder.append(sequenceAsString);
-        }
-
-        return builder.toString();
-
-    }
-
-    @Override
-    public String getText() {
-
-        StringBuilder sb = new StringBuilder();
-
-        TextPositionSequence previous = null;
-        for (TextPositionSequence word : sequences) {
-            if (previous != null) {
-                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
-                    sb.append('\n');
-                } else {
-                    sb.append(' ');
-                }
-            }
-            sb.append(word.toString());
-            previous = word;
-        }
-
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
-
-    }
-
-}

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

@@ -1,209 +0,0 @@
-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.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.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;
-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;
-
-@Service
-@SuppressWarnings("all")
-public class BlockificationService {
-
-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
-
-        List<TextPositionSequence> chunkWords = new ArrayList<>();
-        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
-
-        float minX = 1000, maxX = 0, minY = 1000, maxY = 0;
-        TextPositionSequence prev = null;
-
-        for (TextPositionSequence word : textPositions) {
-
-            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
-            boolean startFromTop = word.getY1() > maxY + word.getHeight();
-
-            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))) {
-
-                TextBlock cb1 = buildTextBlock(chunkWords);
-                chunkBlockList1.add(cb1);
-                chunkWords = new ArrayList<>();
-
-                minX = 1000;
-                maxX = 0;
-                minY = 1000;
-                maxY = 0;
-                prev = null;
-            }
-
-            chunkWords.add(word);
-
-            prev = word;
-            if (word.getX1() < minX) {
-                minX = word.getX1();
-            }
-            if (word.getX2() > maxX) {
-                maxX = word.getX2();
-            }
-            if (word.getY1() < minY) {
-                minY = word.getY1();
-            }
-            if (word.getY2() > maxY) {
-                maxY = word.getY2();
-            }
-        }
-
-        TextBlock cb1 = buildTextBlock(chunkWords);
-        if (cb1 != null) {
-            chunkBlockList1.add(cb1);
-        }
-
-        return new Page(chunkBlockList1);
-    }
-
-
-    private TextBlock buildTextBlock(List<TextPositionSequence> wordBlockList) {
-
-        TextBlock textBlock = null;
-
-        FloatFrequencyCounter lineHeightFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter fontSizeFrequencyCounter = new FloatFrequencyCounter();
-        FloatFrequencyCounter spaceFrequencyCounter = new FloatFrequencyCounter();
-        StringFrequencyCounter fontFrequencyCounter = new StringFrequencyCounter();
-        StringFrequencyCounter styleFrequencyCounter = new StringFrequencyCounter();
-
-        for (TextPositionSequence wordBlock : wordBlockList) {
-
-            lineHeightFrequencyCounter.add(wordBlock.getTextHeight());
-            fontSizeFrequencyCounter.add(wordBlock.getFontSize());
-            spaceFrequencyCounter.add(wordBlock.getSpaceWidth());
-            fontFrequencyCounter.add(wordBlock.getFont());
-            styleFrequencyCounter.add(wordBlock.getFontStyle());
-
-            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getX1(), wordBlock.getX2(), wordBlock.getY1(), wordBlock.getY2(), wordBlockList, wordBlock
-                        .getRotation());
-            } else {
-                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
-                        .getHeight());
-            }
-        }
-
-        if (textBlock != null) {
-            textBlock.setMostPopularWordFont(fontFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordStyle(styleFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordFontSize(fontSizeFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordHeight(lineHeightFrequencyCounter.getMostPopular());
-            textBlock.setMostPopularWordSpaceWidth(spaceFrequencyCounter.getMostPopular());
-            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
-        }
-
-        return textBlock;
-    }
-
-
-    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)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    public Rectangle calculateBodyTextFrame(List<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
-
-        float minX = 10000;
-        float maxX = -100;
-        float minY = 10000;
-        float maxY = -100;
-
-        for (Page page : pages) {
-
-            if (page.getTextBlocks().isEmpty() || landscape != page.isLandscape()) {
-                continue;
-            }
-
-            for (AbstractTextContainer container : page.getTextBlocks()) {
-
-                if (container instanceof TextBlock) {
-                    TextBlock textBlock = (TextBlock) container;
-                    if (textBlock.getMostPopularWordFont() == null || textBlock.getMostPopularWordStyle() == null) {
-                        continue;
-                    }
-
-                    float approxLineCount = PositionUtils.getApproxLineCount(textBlock);
-                    if (approxLineCount < 2.9f) {
-                        continue;
-                    }
-
-                    if (documentFontSizeCounter.getMostPopular() != null) {
-                        if (textBlock.getMostPopularWordFontSize() >= documentFontSizeCounter.getMostPopular()) {
-
-                            if (textBlock.getMinX() < minX) {
-                                minX = textBlock.getMinX();
-                            }
-                            if (textBlock.getMaxX() > maxX) {
-                                maxX = textBlock.getMaxX();
-                            }
-                            if (textBlock.getMinY() < minY) {
-                                minY = textBlock.getMinY();
-                            }
-                            if (textBlock.getMaxY() > maxY) {
-                                maxY = textBlock.getMaxY();
-                            }
-
-                        }
-                    }
-                }
-
-                if (container instanceof Table) {
-                    Table table = (Table) container;
-                    for (List<Cell> row : table.getRows()) {
-                        for (Cell cell : row) {
-
-                            if (cell == null || cell.getTextBlocks() == null) {
-                                continue;
-                            }
-                            for (TextBlock textBlock : cell.getTextBlocks()) {
-                                if (textBlock.getMinX() < minX) {
-                                    minX = textBlock.getMinX();
-                                }
-                                if (textBlock.getMaxX() > maxX) {
-                                    maxX = textBlock.getMaxX();
-                                }
-                                if (textBlock.getMinY() < minY) {
-                                    minY = textBlock.getMinY();
-                                }
-                                if (textBlock.getMaxY() > maxY) {
-                                    maxY = textBlock.getMaxY();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
-    }
-
-}

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

@@ -1,117 +0,0 @@
-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;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ClassificationService {
-
-    private final BlockificationService blockificationService;
-
-
-    public void classifyDocument(Document document) {
-
-        Rectangle bodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
-        Rectangle landscapeBodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
-
-        List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();
-
-        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());
-
-        for (Page page : document.getPages()) {
-            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
-            page.setBodyTextFrame(btf);
-            classifyPage(btf, page, document, headlineFontSizes);
-        }
-    }
-
-
-    public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
-
-        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
-            if (textBlock instanceof TextBlock) {
-                classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
-            }
-        }
-    }
-
-
-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
-                              List<Float> headlineFontSizes) {
-
-        if (document.getFontSizeCounter().getMostPopular() == null) {
-            // TODO Figure out why this happens.
-            return;
-        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
-                .getMostPopular())) {
-            textBlock.setClassification("Header");
-
-        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
-                .getMostPopular())) {
-            textBlock.setClassification("Footer");
-        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
-                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
-                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
-                .getMostPopular() || page.getTextBlocks().size() == 1)) {
-            if (!Pattern.matches("[0-9]+", textBlock.toString())) {
-                textBlock.setClassification("Title");
-            }
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
-                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
-
-            for (int i = 1; i <= headlineFontSizes.size(); i++) {
-                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
-                    textBlock.setClassification("H " + i);
-                    document.setHeadlines(true);
-                }
-            }
-        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
-                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
-                .equals("bold") && !document.getFontStyleCounter()
-                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
-            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
-            document.setHeadlines(true);
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
-                .getFontSizeCounter()
-                .getMostPopular() && textBlock.getMostPopularWordStyle()
-                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
-            textBlock.setClassification("TextBlock Bold");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
-                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
-                .equals(document.getFontStyleCounter()
-                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
-                .getMostPopular()) {
-            textBlock.setClassification("TextBlock");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
-                .getFontSizeCounter()
-                .getMostPopular() && textBlock.getMostPopularWordStyle()
-                .equals("italic") && !document.getFontStyleCounter()
-                .getMostPopular()
-                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
-            textBlock.setClassification("TextBlock Italic");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
-            textBlock.setClassification("TextBlock Unknown");
-        }
-    }
-
-}

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

@@ -1,95 +0,0 @@
-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
-@SuppressWarnings("all")
-public class PositionUtils {
-
-
-    public boolean isWithinBodyTextFrame(Rectangle btf, TextBlock textBlock) {
-
-        //TODO Currently this is not working for rotated pages.
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        double threshold = textBlock.getMostPopularWordHeight() * 3;
-
-        if (textBlock.getMinX() + threshold > btf.getX() &&
-                textBlock.getMaxX() - threshold < btf.getX() + btf.getWidth() &&
-                textBlock.getMinY() + threshold > btf.getY() &&
-                textBlock.getMaxY() - threshold < btf.getY() + btf.getHeight()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, boolean rotated) {
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        if (rotated && textBlock.getMinX() < btf.getX()) {
-            // Its very strange, P{0,0} is on top left in this case, instead of lower left.
-            return true;
-        } else if (!rotated && textBlock.getMinY() > btf.getY() + btf.getHeight()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
-
-        //TODO Currently this is not working for rotated pages.
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        if (textBlock.getMaxY() < btf.getY()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    public boolean isTouchingUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
-
-        //TODO Currently this is not working for rotated pages.
-
-        if (btf == null || textBlock == null) {
-            return false;
-        }
-
-        if (textBlock.getMinY() < btf.getY()) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-
-    public float getHeightDifferenceBetweenChunkWordAndDocumentWord(TextBlock textBlock, Float documentMostPopularWordHeight) {
-        return textBlock.getMostPopularWordHeight() - documentMostPopularWordHeight;
-    }
-
-
-    public Float getApproxLineCount(TextBlock textBlock) {
-        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
-    }
-}

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

@@ -2,9 +2,9 @@ package com.iqser.red.service.redaction.v1.server.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.DictionaryResource;
 
-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
-}
+
+}

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

@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileStatusProcessingUpdateResource;
+
+@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-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/LegalBasisClient.java

@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.LegalBasisMappingResource;
+
+@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
+public interface LegalBasisClient extends LegalBasisMappingResource {
+
+}

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

@@ -0,0 +1,100 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+public class MockMultipartFile implements MultipartFile {
+
+    private final String name;
+    private final String originalFilename;
+    @Nullable
+    private final String contentType;
+    private final byte[] content;
+
+
+    public MockMultipartFile(String name, @Nullable byte[] content) {
+
+        this(name, "", 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() {
+
+        return this.content;
+    }
+
+
+    public InputStream getInputStream() {
+
+        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

@@ -2,8 +2,9 @@ package com.iqser.red.service.redaction.v1.server.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.RulesResource;
 
-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
-}
+
+}

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

@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecognitionEntity {
+
+    private String value;
+    private int startOffset;
+    private int endOffset;
+    private String type;
+
+}

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

@@ -1,6 +1,4 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import java.time.OffsetDateTime;
+package com.iqser.red.service.redaction.v1.server.client.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -11,11 +9,9 @@ import lombok.NoArgsConstructor;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class Comment {
+public class EntityRecognitionSection {
 
-    private String id;
-    private OffsetDateTime date;
+    private int sectionNumber;
     private String text;
-    private String user;
 
 }

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

@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NerEntitiesModel {
+
+    private Map<Integer, List<EntityRecognitionEntity>> data = new HashMap<>();
+
+}

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

@@ -1,17 +1,18 @@
 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.NotFoundException;
+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
@@ -19,10 +20,12 @@ public class ControllerAdvice {
 
     /* error handling */
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler(value = NullPointerException.class)
     public ErrorMessage handleContentNotFoundException(NullPointerException e) {
+
         if (e != null) {
             log.error(e.getMessage(), e);
             return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
@@ -31,11 +34,22 @@ public class ControllerAdvice {
         return new ErrorMessage(OffsetDateTime.now(), "Nullpointer exception");
     }
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.BAD_REQUEST)
     @ExceptionHandler(value = RulesValidationException.class)
     public ErrorMessage handleRulesValidationException(RulesValidationException e) {
+
         return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
     }
 
-}
+
+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
+
+        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,30 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.controller;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-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;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 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.segmentation.PdfSegmentationService;
-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.AnnotationHighlightService;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,129 +15,17 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class RedactionController implements RedactionResource {
 
-    private final PdfVisualisationService pdfVisualisationService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final AnnotationHighlightService annotationHighlightService;
-    private final EntityRedactionService entityRedactionService;
     private final DroolsExecutionService droolsExecutionService;
 
 
     @Override
-    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
+    public void testRules(@RequestBody String rules) {
 
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-
-            log.info("Document structure analysis successful, starting redaction analysis...");
-
-            entityRedactionService.processDocument(classifiedDoc, redactionRequest.getManualRedactions());
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction(), redactionRequest
-                    .getManualRedactions());
-
-            log.info("Redaction analysis successful...");
-
-            return convert(pdDocument, classifiedDoc.getPages()
-                    .size(), classifiedDoc.getRedactionLogEntities(), classifiedDoc.getSectionGrid(), classifiedDoc.getDictionaryVersion(), classifiedDoc.getRulesVersion());
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
+        try {
+            droolsExecutionService.testRules(rules);
+        } catch (Exception e) {
+            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
         }
-
-    }
-
-
-    @Override
-    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(pdfSegmentationRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);
-
-            return convert(pdDocument, classifiedDoc.getPages().size());
-
-        } catch (IOException e) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    @Override
-    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
-
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            pdDocument.setAllSecurityToBeRemoved(true);
-
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);
-
-            return convert(pdDocument, classifiedDoc.getPages().size());
-
-        } 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 = 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) {
-            throw new RedactionException(e);
-        }
-
-    }
-
-
-    @Override
-    public void updateRules(@RequestBody String rules) {
-
-        droolsExecutionService.updateRules(rules);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-
-        return convert(document, numberOfPages, null, null, 0, 0);
-    }
-
-
-    private RedactionResult convert(PDDocument document, int numberOfPages,
-                                    List<RedactionLogEntry> redactionLogEntities,
-                                    SectionGrid sectionGrid, long dictionaryVersion, long rulesVersion) throws IOException {
-
-        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
-            document.save(byteArrayOutputStream);
-            return RedactionResult.builder()
-                    .document(byteArrayOutputStream.toByteArray())
-                    .numberOfPages(numberOfPages)
-                    .redactionLog(new RedactionLog(redactionLogEntities,dictionaryVersion, rulesVersion))
-                    .sectionGrid(sectionGrid)
-                    .build();
-        }
-
     }
 
 }

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

@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RuleBuilderModelService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class RuleBuilderController implements RuleBuilderResource {
+
+    private final RuleBuilderModelService ruleBuilderModelService;
+
+
+    @Override
+    public RuleBuilderModel getRuleBuilderModel() {
+
+        return ruleBuilderModelService.getRuleBuilderModel();
+    }
+
+}

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

@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+
+        super(message);
+    }
+
+}

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

@@ -3,10 +3,13 @@ package com.iqser.red.service.redaction.v1.server.exception;
 public class RedactionException extends RuntimeException {
 
     public RedactionException(Throwable cause) {
+
         super("Could not parse document", cause);
     }
 
+
     public RedactionException() {
+
         super("Could not parse document");
     }
 

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

@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.exception;
 public class RulesValidationException extends RuntimeException {
 
     public RulesValidationException(String message, Throwable t) {
+
         super(message, t);
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/ImageServiceResponseAdapter.java

@@ -0,0 +1,80 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter;
+
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image.ImageServiceResponse;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+
+@Service
+@RequiredArgsConstructor
+public class ImageServiceResponseAdapter {
+
+    private final ObjectMapper objectMapper;
+    private final RedactionStorageService redactionStorageService;
+
+
+    @SneakyThrows
+    public Map<Integer, List<ClassifiedImage>> convertImages(String dossierId, String fileId) {
+
+        var imageClassificationStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(dossierId, fileId, FileType.IMAGE_INFO));
+
+        ImageServiceResponse imageServiceResponse = objectMapper.readValue(imageClassificationStream, ImageServiceResponse.class);
+
+        Map<Integer, List<ClassifiedImage>> images = new HashMap<>();
+        imageServiceResponse.getData().forEach(imageMetadata -> {
+            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification()
+                    .getLabel()
+                    .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
+            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
+                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
+                            imageMetadata.getPosition().getY1(),
+                            imageMetadata.getGeometry().getWidth(),
+                            imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber()));
+        });
+
+        // Currently This is a copy but, it will be changed later because i don' t think that we should unclassified images.
+        imageServiceResponse.getDataCV().forEach(imageMetadata -> {
+            var classification = imageMetadata.getFilters().isAllPassed() ? ImageType.valueOf(imageMetadata.getClassification()
+                    .getLabel()
+                    .toUpperCase(Locale.ROOT)) : ImageType.OTHER;
+            images.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
+                    .add(new ClassifiedImage(new Rectangle2D.Double(imageMetadata.getPosition().getX1(),
+                            imageMetadata.getPosition().getY1(),
+                            imageMetadata.getGeometry().getWidth(),
+                            imageMetadata.getGeometry().getHeight()), classification, imageMetadata.isAlpha(), imageMetadata.getPosition().getPageNumber()));
+        });
+
+        return images;
+    }
+
+
+    public void findOcr(ClassificationPage page) {
+
+        page.getImages().forEach(image -> {
+            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/layoutparsing/classification/adapter/RedactionLogEntryAdapter.java

@@ -0,0 +1,167 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter;
+
+import static java.lang.String.format;
+import static java.util.stream.Collectors.groupingBy;
+
+import java.awt.geom.Rectangle2D;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLog;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.EntityType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionEntity;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.entity.RedactionPosition;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.Page;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.SemanticNode;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.services.EntityCreationService;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.SearchImplementation;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class RedactionLogEntryAdapter {
+
+    private static final double MATCH_THRESHOLD = 1;
+    private final EntityCreationService entityCreationService;
+
+
+    public Stream<RedactionEntity> toRedactionEntity(RedactionLog redactionLog, SemanticNode node) {
+
+        List<Integer> pageNumbers = redactionLog.getRedactionLogEntry().stream().flatMap(entry -> entry.getPositions().stream().map(Rectangle::getPage)).distinct().toList();
+        if (!pageNumbers.stream().allMatch(node::isOnPage)) {
+            throw new IllegalArgumentException(format("SemanticNode %s does not contain these pages %s present in the redaction log",
+                    node,
+                    pageNumbers.stream().filter(pageNumber -> !node.isOnPage(pageNumber)).toList()));
+        }
+        Set<String> entryValues = redactionLog.getRedactionLogEntry().stream().map(RedactionLogEntry::getValue).map(String::toLowerCase).collect(Collectors.toSet());
+        SearchImplementation searchImplementation = new SearchImplementation(entryValues, true);
+
+        Map<String, List<RedactionEntity>> tempEntitiesByValue = findAllPossibleEntitiesAndGroupByValueIgnoringCase(node, searchImplementation);
+
+        assert allValuesFound(tempEntitiesByValue, entryValues);
+
+        List<RedactionEntity> entities = redactionLog.getRedactionLogEntry()
+                .stream()
+                .map(entry -> findClosestRedactionEntity(entry, tempEntitiesByValue.get(entry.getValue().toLowerCase(Locale.ROOT)), node))
+                .toList();
+        tempEntitiesByValue.values().stream().flatMap(Collection::stream).forEach(RedactionEntity::removeFromGraph);
+        return entities.stream();
+    }
+
+
+    private static boolean allValuesFound(Map<String, List<RedactionEntity>> entitiesByValue, Set<String> entryValues) {
+
+        return entitiesByValue.keySet().equals(entryValues);
+    }
+
+
+    private Map<String, List<RedactionEntity>> findAllPossibleEntitiesAndGroupByValueIgnoringCase(SemanticNode node, SearchImplementation searchImplementation) {
+
+        return searchImplementation.getBoundaries(node.getTextBlock(), node.getBoundary())
+                .stream()
+                .map(boundary -> entityCreationService.byBoundary(boundary, "temp", EntityType.ENTITY, node))
+                .collect(groupingBy(entity -> entity.getValue().toLowerCase(Locale.ROOT)));
+    }
+
+
+    private RedactionEntity findClosestRedactionEntity(RedactionLogEntry redactionLogEntry, List<RedactionEntity> entitiesWithSameValue, SemanticNode node) {
+
+        RedactionEntity closestEntity = entitiesWithSameValue.stream()
+                .filter(entity -> pagesMatch(entity, redactionLogEntry))
+                .min(Comparator.comparingDouble(entity -> calculateMinDistance(redactionLogEntry, entity)))
+                .orElseThrow(() -> new NotFoundException(format("No entity with similar position found for %s", redactionLogEntry)));
+
+        double distance = calculateMinDistance(redactionLogEntry, closestEntity);
+        if (distance > MATCH_THRESHOLD) {
+            throw new NotFoundException(format("Distance to closest found entity is %.2f for \n%s \n%s",
+                    distance,
+                    redactionLogEntry.getPositions(),
+                    closestEntity.getRedactionPositionsPerPage()));
+        }
+
+        return createCorrectEntity(redactionLogEntry, node, closestEntity);
+    }
+
+
+    private RedactionEntity createCorrectEntity(RedactionLogEntry redactionLogEntry, SemanticNode node, RedactionEntity closestEntity) {
+
+        RedactionEntity correctEntity = entityCreationService.byBoundary(closestEntity.getBoundary(),
+                redactionLogEntry.getType(),
+                redactionLogEntry.isRecommendation() ? EntityType.RECOMMENDATION : EntityType.ENTITY,
+                node);
+
+        String ruleIdentifier = redactionLogEntry.getType() + "." + redactionLogEntry.getMatchedRule() + ".0";
+        if (redactionLogEntry.isRedacted()) {
+            correctEntity.apply(ruleIdentifier, redactionLogEntry.getReason(), redactionLogEntry.getLegalBasis());
+        } else {
+            correctEntity.skip(ruleIdentifier, redactionLogEntry.getReason());
+        }
+        correctEntity.setDictionaryEntry(redactionLogEntry.isDictionaryEntry());
+        correctEntity.setDossierDictionaryEntry(redactionLogEntry.isDossierDictionaryEntry());
+        return correctEntity;
+    }
+
+
+    private static boolean pagesMatch(RedactionEntity entity, RedactionLogEntry redactionLogEntry) {
+
+        Set<Integer> entityPageNumbers = entity.getRedactionPositionsPerPage().stream().map(RedactionPosition::getPage).map(Page::getNumber).collect(Collectors.toSet());
+        Set<Integer> redactionLogEntryPageNumbers = redactionLogEntry.getPositions().stream().map(Rectangle::getPage).collect(Collectors.toSet());
+        return entityPageNumbers.equals(redactionLogEntryPageNumbers);
+    }
+
+
+    private double calculateMinDistance(RedactionLogEntry redactionLogEntry, RedactionEntity entity) {
+
+        if (redactionLogEntry.getPositions().size() != countRectangles(entity)) {
+            return Double.MAX_VALUE;
+        }
+        return redactionLogEntry.getPositions().stream().mapToDouble(redactionLogEntryRectangle -> calculateMinDistancePerRectangle(entity, redactionLogEntryRectangle)).sum();
+    }
+
+
+    private static long countRectangles(RedactionEntity entity) {
+
+        return entity.getRedactionPositionsPerPage().stream().mapToLong(redactionPosition -> redactionPosition.getRectanglePerLine().size()).sum();
+    }
+
+
+    private double calculateMinDistancePerRectangle(RedactionEntity entity, Rectangle redactionLogEntryRectangle) {
+
+        return entity.getRedactionPositionsPerPage()
+                .stream()
+                .filter(redactionPosition -> redactionPosition.getPage().getNumber() == redactionLogEntryRectangle.getPage())
+                .map(RedactionPosition::getRectanglePerLine)
+                .flatMap(Collection::stream)
+                .mapToDouble(rectangle -> calculateDistance(rectangle, toRectangle2D(redactionLogEntryRectangle)))
+                .min()
+                .orElse(Double.MAX_VALUE);
+    }
+
+
+    private double calculateDistance(Rectangle2D rectangle, Rectangle2D rectangle2D) {
+
+        return Math.abs(rectangle.getMinX() - rectangle2D.getMinX()) //
+                + Math.abs(rectangle.getMinY() - rectangle2D.getMinY()) //
+                + Math.abs(rectangle.getMaxX() - rectangle2D.getMaxX()) //
+                + Math.abs(rectangle.getMaxY() - rectangle2D.getMaxY());
+    }
+
+
+    private Rectangle2D toRectangle2D(Rectangle rectangle) {
+
+        return new Rectangle2D.Float(rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY() + rectangle.getHeight(), rectangle.getWidth(), -rectangle.getHeight());
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/TableServiceResponseAdapter.java

@@ -0,0 +1,63 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table.PdfTableCell;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table.TableCells;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table.TableServiceResponse;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TableServiceResponseAdapter {
+
+    private final ObjectMapper objectMapper;
+    private final RedactionStorageService redactionStorageService;
+
+
+    @SneakyThrows
+    public Map<Integer, List<PdfTableCell>> convertTables(String dossierId, String fileId) {
+
+        var tableClassificationStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(dossierId, fileId, FileType.TABLES));
+
+        TableServiceResponse tableServiceResponse = objectMapper.readValue(tableClassificationStream, TableServiceResponse.class);
+
+        Map<Integer, List<PdfTableCell>> tableCells = new HashMap<>();
+        tableServiceResponse.getData()
+                .forEach(tableData -> tableCells.computeIfAbsent(tableData.getPageInfo().getNumber(), tableCell -> new ArrayList<>())
+                        .addAll(convertTableCells(tableData.getTableCells())));
+
+        return tableCells;
+    }
+
+
+    private Collection<? extends PdfTableCell> convertTableCells(List<TableCells> tableCells) {
+
+        List<PdfTableCell> pdfTableCells = new ArrayList<>();
+
+        tableCells.forEach(t -> pdfTableCells.add(PdfTableCell.builder()
+                .y0(t.getY0())
+                .x1(t.getX1())
+                .y1(t.getY1())
+                .x0(t.getX0())
+                .width(t.getWidth())
+                .height(t.getHeight())
+                .build()));
+
+        return pdfTableCells;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/Classification.java

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+
+@Data
+public class Classification {
+
+    private Map<String, Float> probabilities = new HashMap<>();
+    private String label;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/FilterGeometry.java

@@ -0,0 +1,11 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class FilterGeometry {
+
+    private ImageSize imageSize;
+    private ImageFormat imageFormat;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/Filters.java

@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class Filters {
+
+    private FilterGeometry geometry;
+    private Probability probability;
+    private boolean allPassed;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/Geometry.java

@@ -0,0 +1,11 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class Geometry {
+
+    private float width;
+    private float height;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/ImageFormat.java

@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class ImageFormat {
+
+    private float quotient;
+    private boolean tooTall;
+    private boolean tooWide;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/ImageMetadata.java

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class ImageMetadata {
+
+    private Classification classification;
+    private Position position;
+    private Geometry geometry;
+    private Filters filters;
+    private boolean alpha;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/ImageServiceResponse.java

@@ -0,0 +1,46 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+@Data
+public class ImageServiceResponse {
+
+    private String dossierId;
+    private String fileId;
+
+    @JsonProperty(value = "imageMetadata")
+    @JsonAlias("data")
+    private List<ImageMetadata> data = new ArrayList<>();
+
+    private List<ImageMetadata> dataCV = new ArrayList<>();
+
+
+    @JsonProperty(value = "imageMetadata")
+    @JsonAlias("data")
+    public void setData(List<ImageMetadata> data) {this.data = data;}
+
+
+    public List<ImageMetadata> getData() {
+
+        if (this.data == null) {
+            this.data = new ArrayList<>();
+        }
+        return data;
+    }
+
+
+    public List<ImageMetadata> getDataCV() {
+
+        if (this.dataCV == null) {
+            this.dataCV = new ArrayList<>();
+        }
+        return dataCV;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/ImageSize.java

@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class ImageSize {
+
+    private float quotient;
+    private boolean tooLarge;
+    private boolean tooSmall;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/Position.java

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class Position {
+
+    private float x1;
+    private float x2;
+    private float y1;
+    private float y2;
+    private int pageNumber;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/image/Probability.java

@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.image;
+
+import lombok.Data;
+
+@Data
+public class Probability {
+
+    private boolean unconfident;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/table/PageInfo.java

@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table;
+
+import lombok.Data;
+
+@Data
+public class PageInfo {
+
+    private int number;
+    private int rotation;
+    private float width;
+    private float height;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/table/PdfTableCell.java

@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@RequiredArgsConstructor
+public class PdfTableCell {
+
+    private float x0;
+    private float y0;
+    private float x1;
+    private float y1;
+    private float width;
+    private float height;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/table/TableCells.java

@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table;
+
+import lombok.Data;
+
+@Data
+public class TableCells {
+
+    private float x0;
+    private float y0;
+    private float x1;
+    private float y1;
+    private float width;
+    private float height;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/table/TableData.java

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class TableData {
+
+    private PageInfo pageInfo;
+    private List<TableCells> tableCells = new ArrayList<>();
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/adapter/table/TableServiceResponse.java

@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.adapter.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class TableServiceResponse {
+
+    private String dossierId;
+    private String fileId;
+    private String operation;
+    private String targetFileExtension;
+    private String responseFileExtension;
+
+    private List<TableData> data = new ArrayList<>();
+
+}

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

@@ -0,0 +1,80 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public abstract class AbstractPageBlock {
+
+    @JsonIgnore
+    protected float minX;
+    @JsonIgnore
+    protected float maxX;
+    @JsonIgnore
+    protected float minY;
+    @JsonIgnore
+    protected float maxY;
+    @JsonIgnore
+    protected PageBlockType classification;
+    @JsonIgnore
+    protected int page;
+
+    @JsonIgnore
+    private Orientation orientation = Orientation.NONE;
+
+
+    public abstract String getText();
+
+
+    public boolean isHeadline() {
+
+        return this instanceof TextPageBlock && this.getClassification() != null && this.getClassification().isHeadline();
+    }
+
+
+    public boolean containsBlock(TextPageBlock other) {
+
+        return this.minX <= other.getPdfMinX() && this.maxX >= other.getPdfMaxX() && this.minY >= other.getPdfMinY() && this.maxY <= other.getPdfMaxY();
+    }
+
+
+    public boolean contains(AbstractPageBlock other) {
+
+        return this.minX <= other.minX && this.maxX >= other.maxX && this.minY >= other.minY && this.maxY <= other.maxY;
+    }
+
+
+    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();
+    }
+
+
+    @JsonIgnore
+    public float getHeight() {
+
+        return maxY - minY;
+    }
+
+
+    @JsonIgnore
+    public float getWidth() {
+
+        return maxX - minX;
+    }
+
+
+    public boolean intersectsY(AbstractPageBlock atc) {
+
+        return this.minY <= atc.getMaxY() && this.maxY >= atc.getMinY();
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.section.SectionGrid;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.StringFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.dictionary.DictionaryVersion;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ClassificationDocument {
+
+    private List<ClassificationPage> pages = new ArrayList<>();
+    private List<ClassificationSection> sections = new ArrayList<>();
+    private List<ClassificationHeader> headers = new ArrayList<>();
+    private List<ClassificationFooter> footers = new ArrayList<>();
+    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
+    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
+    private boolean headlines;
+
+    private SectionGrid sectionGrid = new SectionGrid();
+    private DictionaryVersion dictionaryVersion;
+    private long rulesVersion;
+
+}

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

@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ClassificationFooter {
+
+    private List<TextPageBlock> textBlocks;
+
+}

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

@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ClassificationHeader {
+
+    private List<TextPageBlock> textBlocks;
+
+}

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

@@ -0,0 +1,38 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.StringFrequencyCounter;
+
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+public class ClassificationPage {
+
+    @NonNull
+    private List<AbstractPageBlock> textBlocks;
+
+    private List<ClassifiedImage> images = new ArrayList<>();
+
+    private Rectangle bodyTextFrame;
+
+    private boolean landscape;
+    private int rotation;
+
+    private int pageNumber;
+
+    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
+    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
+    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
+    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
+
+    private float pageWidth;
+    private float pageHeight;
+
+}

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

@@ -0,0 +1,32 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image.ClassifiedImage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ClassificationSection {
+
+    private List<AbstractPageBlock> pageBlocks = new ArrayList<>();
+    private List<ClassifiedImage> images = new ArrayList<>();
+    private String headline;
+
+
+    public List<TablePageBlock> getTables() {
+
+        List<TablePageBlock> tables = new ArrayList<>();
+        pageBlocks.forEach(block -> {
+            if (block instanceof TablePageBlock) {
+                tables.add((TablePageBlock) block);
+            }
+        });
+        return tables;
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -9,36 +9,39 @@ 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){
-                mostPopular = entry;
-            } else if(entry.getValue() >= mostPopular.getValue()){
+        for (Map.Entry<Float, Integer> entry : countPerValue.entrySet()) {
+            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
                 mostPopular = entry;
             }
         }
@@ -46,12 +49,12 @@ 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 +63,11 @@ public class FloatFrequencyCounter
     }
 
 
-    public Float getHighest(){
+    public Float getHighest() {
+
         Float highest = null;
-        for(Float value: countPerValue.keySet()){
-            if (highest == null){
-                highest = value;
-            } else if(value > highest){
+        for (Float value : countPerValue.keySet()) {
+            if (highest == null || value > highest) {
                 highest = value;
             }
         }

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

@@ -0,0 +1,8 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.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/layoutparsing/classification/model/PageBlockType.java

@@ -0,0 +1,38 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model;
+
+public enum PageBlockType {
+    H1,
+    H2,
+    H3,
+    H4,
+    H5,
+    H6,
+    HEADER,
+    FOOTER,
+    TITLE,
+    PARAGRAPH,
+    PARAGRAPH_BOLD,
+    PARAGRAPH_ITALIC,
+    PARAGRAPH_UNKNOWN,
+    OTHER,
+    TABLE;
+
+
+    public static PageBlockType getHeadlineType(int i) {
+
+        return switch (i) {
+            case 1 -> PageBlockType.H1;
+            case 2 -> PageBlockType.H2;
+            case 3 -> PageBlockType.H3;
+            case 4 -> PageBlockType.H4;
+            case 5 -> PageBlockType.H5;
+            default -> PageBlockType.H6;
+        };
+    }
+
+
+    public boolean isHeadline() {
+
+        return this.equals(H1) || this.equals(H2) || this.equals(H3) || this.equals(H4) || this.equals(H5) || this.equals(H6);
+    }
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/image/ClassifiedImage.java

@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.image;
+
+import java.awt.geom.Rectangle2D;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.document.graph.nodes.ImageType;
+
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+public class ClassifiedImage {
+
+    @NonNull
+    private Rectangle2D position;
+    @NonNull
+    private ImageType imageType;
+    private boolean isAppendedToSection;
+    @NonNull
+    private boolean hasTransparency;
+    @NonNull
+    private int page;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/table/Cell.java

@@ -1,37 +1,42 @@
-package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
 
 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.layoutparsing.classification.model.text.TextPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 @SuppressWarnings("serial")
 @Data
 @EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class Cell extends Rectangle {
 
-    private List<TextBlock> textBlocks = new ArrayList<>();
+    private List<TextPageBlock> textBlocks = new ArrayList<>();
 
     private List<Cell> headerCells = new ArrayList<>();
 
     private boolean isHeaderCell;
 
+    private static final int MIN_SIZE = 1;
+
+    private int pageNumber;
+
 
     public Cell(Point2D topLeft, Point2D bottomRight) {
 
-        super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight
-                .getY() - topLeft.getY()));
+        super((float) topLeft.getY(), (float) topLeft.getX(), (float) (bottomRight.getX() - topLeft.getX()), (float) (bottomRight.getY() - topLeft.getY()));
     }
 
 
-    public void addTextBlock(TextBlock textBlock) {
+    public void addTextBlock(TextPageBlock textBlock) {
 
         textBlocks.add(textBlock);
     }
@@ -42,16 +47,15 @@ public class Cell extends Rectangle {
 
         StringBuilder sb = new StringBuilder();
 
-
-        Iterator<TextBlock> itty = textBlocks.iterator();
+        Iterator<TextPageBlock> itty = textBlocks.iterator();
         TextPositionSequence previous = null;
         while (itty.hasNext()) {
 
-            TextBlock textBlock = itty.next();
+            TextPageBlock textBlock = itty.next();
 
             for (TextPositionSequence word : textBlock.getSequences()) {
                 if (previous != null) {
-                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                    if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
                         sb.append('\n');
                     } else {
                         sb.append(' ');
@@ -63,13 +67,13 @@ public class Cell extends Rectangle {
 
         }
 
-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
-                .replaceAll("\n", " ")
-                .replaceAll(" {2}", " ");
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
     }
 
 
+    public boolean hasMinimumSize() {
 
+        return this.getHeight() >= MIN_SIZE && this.getWidth() >= MIN_SIZE;
+    }
 
-
-}
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/table/CellPosition.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
 
 import lombok.RequiredArgsConstructor;
 import lombok.Value;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/table/CleanRulings.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
 
 import java.util.List;
 
@@ -11,4 +11,5 @@ public class CleanRulings {
 
     List<Ruling> horizontal;
     List<Ruling> vertical;
+
 }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/table/Rectangle.java

@@ -0,0 +1,218 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
+
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.Comparator;
+import java.util.List;
+
+@SuppressWarnings("all")
+public class Rectangle extends Rectangle2D.Float {
+
+    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(float top, float left, float width, float height) {
+
+        super();
+        this.setRect(left, top, width, height);
+    }
+
+
+    /**
+     * @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;
+
+        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 int compareTo(Rectangle other) {
+
+        return ILL_DEFINED_ORDER.compare(this, other);
+    }
+
+
+    // I'm bad at Java and need this for fancy sorting in
+    // technology.tabula.TextChunk.
+    public int isLtrDominant() {
+
+        return 0;
+    }
+
+
+    public float getArea() {
+
+        return this.width * this.height;
+    }
+
+
+    public float verticalOverlap(Rectangle other) {
+
+        return Math.max(0, Math.min(this.getBottom(), other.getBottom()) - Math.max(this.getTop(), other.getTop()));
+    }
+
+
+    public boolean verticallyOverlaps(Rectangle other) {
+
+        return verticalOverlap(other) > 0;
+    }
+
+
+    public float horizontalOverlap(Rectangle other) {
+
+        return Math.max(0, Math.min(this.getRight(), other.getRight()) - Math.max(this.getLeft(), other.getLeft()));
+    }
+
+
+    public boolean horizontallyOverlaps(Rectangle other) {
+
+        return horizontalOverlap(other) > 0;
+    }
+
+
+    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;
+        }
+
+        return rv;
+
+    }
+
+
+    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 (float) (intersectionArea / unionArea);
+    }
+
+
+    public Rectangle merge(Rectangle other) {
+
+        this.setRect(this.createUnion(other));
+        return this;
+    }
+
+
+    public float getTop() {
+
+        return (float) this.getMinY();
+    }
+
+
+    public void setTop(float top) {
+
+        float deltaHeight = top - this.y;
+        this.setRect(this.x, top, this.width, this.height - deltaHeight);
+    }
+
+
+    public float getRight() {
+
+        return (float) this.getMaxX();
+    }
+
+
+    public void setRight(float right) {
+
+        this.setRect(this.x, this.y, right - this.x, this.height);
+    }
+
+
+    public float getLeft() {
+
+        return (float) this.getMinX();
+    }
+
+
+    public void setLeft(float left) {
+
+        float deltaWidth = left - this.x;
+        this.setRect(left, this.y, this.width - deltaWidth, this.height);
+    }
+
+
+    public float getBottom() {
+
+        return (float) this.getMaxY();
+    }
+
+
+    public void setBottom(float bottom) {
+
+        this.setRect(this.x, this.y, this.width, bottom - this.y);
+    }
+
+
+    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())};
+    }
+
+
+    @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/layoutparsing/classification/model/table/Ruling.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
 
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
@@ -11,244 +11,26 @@ 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 com.iqser.red.service.redaction.v1.server.layoutparsing.classification.utils.CohenSutherlandClipping;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.utils.Utils;
 
 import lombok.extern.slf4j.Slf4j;
 
-
 @Slf4j
 @SuppressWarnings("all")
 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) {
             if (r.intersects(area)) {
@@ -258,20 +40,25 @@ public class Ruling extends Line2D.Float {
         return rv;
     }
 
+
     // log(n) implementation of find_intersections
     // based on http://people.csail.mit.edu/indyk/6.838-old/handouts/lec2.pdf
     public static Map<Point2D, Ruling[]> findIntersections(List<Ruling> horizontals, List<Ruling> verticals) {
 
         class SortObject {
+
             protected SOType type;
             protected float position;
             protected Ruling ruling;
 
+
             public SortObject(SOType type, float position, Ruling ruling) {
+
                 this.type = type;
                 this.position = position;
                 this.ruling = ruling;
             }
+
         }
 
         List<SortObject> sos = new ArrayList<>();
@@ -279,6 +66,7 @@ public class Ruling extends Line2D.Float {
         TreeMap<Ruling, Boolean> tree = new TreeMap<>(new Comparator<Ruling>() {
             @Override
             public int compare(Ruling o1, Ruling o2) {
+
                 return java.lang.Double.compare(o1.getTop(), o2.getTop());
             }
         });
@@ -286,6 +74,7 @@ public class Ruling extends Line2D.Float {
         TreeMap<Point2D, Ruling[]> rv = new TreeMap<>(new Comparator<Point2D>() {
             @Override
             public int compare(Point2D o1, Point2D o2) {
+
                 if (o1.getY() > o2.getY()) {
                     return 1;
                 }
@@ -314,6 +103,7 @@ public class Ruling extends Line2D.Float {
         Collections.sort(sos, new Comparator<SortObject>() {
             @Override
             public int compare(SortObject a, SortObject b) {
+
                 int rv;
                 if (Utils.feq(a.position, b.position)) {
                     if (a.type == SOType.VERTICAL && b.type == SOType.HLEFT) {
@@ -343,10 +133,8 @@ public class Ruling extends Line2D.Float {
                             if (i == null) {
                                 continue;
                             }
-                            rv.put(i,
-                                    new Ruling[]{h.getKey().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT),
-                                            so.ruling.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT)});
-                        } catch(UnsupportedOperationException e){
+                            rv.put(i, new Ruling[]{h.getKey().expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT), so.ruling.expand(PERPENDICULAR_PIXEL_EXPAND_AMOUNT)});
+                        } catch (UnsupportedOperationException e) {
                             log.info("Some line are oblique, ignoring...");
                             continue;
                         }
@@ -366,4 +154,284 @@ 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/layoutparsing/classification/model/table/TablePageBlock.java

@@ -1,57 +1,46 @@
-package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table;
 
+import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 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 com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.PageBlockType;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
 
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class Table extends AbstractTextContainer {
+public class TablePageBlock extends AbstractPageBlock {
 
     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;
 
 
-    public Table(List<Cell> cells, Rectangle area, int rotation) {
+    public TablePageBlock(List<Cell> cells, Rectangle area, int rotation) {
 
         addCells(cells);
         minX = area.getLeft();
         minY = area.getBottom();
         maxX = area.getRight();
         maxY = area.getTop();
-        classification = "Table";
+        classification = PageBlockType.TABLE;
         this.rotation = rotation;
-
     }
 
 
@@ -59,6 +48,16 @@ public class Table extends AbstractTextContainer {
 
         if (rows == null) {
             rows = computeRows();
+
+            // 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()) {
+                    rowsToRemove.add(row);
+                }
+            }
+            rows.removeAll(rowsToRemove);
+
             computeHeaders();
         }
 
@@ -69,19 +68,13 @@ public class Table extends AbstractTextContainer {
 
     public int getRowCount() {
 
-        if (rowCount == -1) {
-            rowCount = getRows().size();
-        }
-        return rowCount;
+        return getRows().size();
     }
 
 
     public int getColCount() {
 
-        if (colCount == -1) {
-            colCount = getRows().stream().mapToInt(List::size).max().orElse(0);
-        }
-        return colCount;
+        return getRows().stream().mapToInt(List::size).max().orElse(0);
 
     }
 
@@ -100,6 +93,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);
@@ -132,10 +129,7 @@ public class Table extends AbstractTextContainer {
                 if (lastHeaderCell != null) {
                     cell.getHeaderCells().add(lastHeaderCell);
                 }
-                if (CollectionUtils.isNotEmpty(cell.getTextBlocks()) && cell.getTextBlocks()
-                        .get(0)
-                        .getMostPopularWordStyle()
-                        .equals("bold")) {
+                if (CollectionUtils.isNotEmpty(cell.getTextBlocks()) && cell.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
                     cell.setHeaderCell(true);
                 }
             }
@@ -162,7 +156,7 @@ public class Table extends AbstractTextContainer {
             for (int i = unrotatedColCount - 1; i >= 0; i--) { // rows
                 List<Cell> lastRow = new ArrayList<>();
                 for (int j = 0; j < unrotatedRowCount; j++) { // cols
-                    Cell cell = cells.get(new CellPosition(i, j));
+                    Cell cell = cells.get(new CellPosition(j, i));
                     if (cell != null) {
                         lastRow.add(cell);
                     }
@@ -204,82 +198,74 @@ public class Table extends AbstractTextContainer {
             return;
         }
 
-        Iterator<Cell> itty = cells.iterator();
+        cells.removeIf(cell -> cell.getWidth() < 1.1 || cell.getHeight() < 1.1);
 
-        while (itty.hasNext()) {
-            Cell cell = itty.next();
-            if (cell.getWidth() > 1.1 && cell.getHeight() > 1.1) {
-                si.add(cell);
-            } else {
-                itty.remove();
-            }
-        }
+        List<List<Cell>> rowsOfCells = calculateStructure(cells);
 
-        List<List<Cell>> rowsOfCells = rowsOfCells(cells);
-
-        Map<Integer, Cell> previousNonNullCellForColumnIndex = new HashMap<>();
         for (int i = 0; i < rowsOfCells.size(); i++) {
-            List<Cell> row = rowsOfCells.get(i);
-            Iterator<Cell> rowCells = row.iterator();
-            int startColumn = 0;
-            int jumpToColumn = 0;
-            while (rowCells.hasNext()) {
-                Cell cell = rowCells.next();
-                if (i > 0) {
-                    Rectangle rectangle = new Rectangle(cell.getBottom(),
-                            si.getBounds().getLeft(),
-                            cell.getLeft() - si.getBounds().getLeft() + 1,
-                            si.getBounds().getBottom() - cell.getBottom());
-                    List<List<Cell>> others = rowsOfCells(si.contains(rectangle));
-
-                    for (List<Cell> r : others) {
-                        jumpToColumn = Math.max(jumpToColumn, r.size());
-                    }
-
-                    while (startColumn != jumpToColumn) {
-                        add(previousNonNullCellForColumnIndex.get(startColumn), i, startColumn);
-                        startColumn++;
-                    }
-                }
-                add(cell, i, startColumn);
-                previousNonNullCellForColumnIndex.put(startColumn, cell);
-                startColumn++;
-                jumpToColumn = startColumn;
+            for (int j = 0; j < rowsOfCells.get(i).size(); j++) {
+                add(rowsOfCells.get(i).get(j), i, j);
             }
         }
+
     }
 
 
-    private List<List<Cell>> rowsOfCells(List<Cell> cells) {
+    /**
+     * Calculates the structure of the table. For spanning rows and columns multiple cells with the same values will be inserted.
+     *
+     * @param cells The found cells
+     * @return TablePageBlock Structure
+     */
+    private List<List<Cell>> calculateStructure(List<Cell> cells) {
 
-        List<List<Cell>> rv = new ArrayList<>();
+        List<List<Cell>> matrix = new ArrayList<>();
 
         if (cells.isEmpty()) {
-            return rv;
+            return matrix;
         }
-        cells.sort(Comparator.comparingDouble(Rectangle::getLeft));
 
-        cells.sort(Collections.reverseOrder((arg0, arg1) -> Float.compare(Utils.round(arg0.getBottom(), 2),
-                Utils.round(arg1
-                .getBottom(), 2))));
+        Set<Float> uniqueX = new HashSet<>();
+        Set<Float> uniqueY = new HashSet<>();
+        cells.stream().filter(c -> !c.getTextBlocks().isEmpty() || c.getHeight() > 3 && c.getWidth() > 3).forEach(c -> {
+            uniqueX.add(c.getLeft());
+            uniqueX.add(c.getRight());
+            uniqueY.add(c.getBottom());
+            uniqueY.add(c.getTop());
+        });
 
-        Iterator<Cell> iter = cells.iterator();
-        Cell c = iter.next();
-        float lastTop = c.getBottom();
-        List<Cell> lastRow = new ArrayList<>();
-        lastRow.add(c);
-        rv.add(lastRow);
+        var sortedUniqueX = uniqueX.stream().sorted().toList();
+        var sortedUniqueY = uniqueY.stream().sorted().toList();
 
-        while (iter.hasNext()) {
-            c = iter.next();
-            if (!Utils.feq(c.getBottom(), lastTop)) {
-                lastRow = new ArrayList<>();
-                rv.add(lastRow);
+        Float prevY = null;
+        for (Float y : sortedUniqueY) {
+
+            List<Cell> row = new ArrayList<>();
+
+            Float prevX = null;
+            for (Float x : sortedUniqueX) {
+
+                if (prevY != null && prevX != null) {
+                    var cell = new Cell(new Point2D.Float(prevX, prevY), new Point2D.Float(x, y));
+
+                    var intersectionCell = cells.stream().filter(c -> cell.intersects(c) && cell.overlapRatio(c) > 0.1f).findFirst();
+                    intersectionCell.ifPresent(value -> cell.getTextBlocks().addAll(value.getTextBlocks()));
+                    if (cell.hasMinimumSize()) {
+                        row.add(cell);
+                    }
+                }
+                prevX = x;
             }
-            lastRow.add(c);
-            lastTop = c.getBottom();
+
+            if (prevY != null && prevX != null && !row.isEmpty()) {
+                matrix.add(row);
+            }
+            prevY = y;
         }
-        return rv;
+
+        Collections.reverse(matrix);
+
+        return matrix;
     }
 
 
@@ -302,7 +288,7 @@ public class Table extends AbstractTextContainer {
                     }
                     if (column != null && column.getTextBlocks() != null) {
                         boolean first = true;
-                        for (TextBlock textBlock : column.getTextBlocks()) {
+                        for (TextPageBlock textBlock : column.getTextBlocks()) {
                             if (!first) {
                                 sb.append("\n");
                             }
@@ -334,7 +320,7 @@ public class Table extends AbstractTextContainer {
                     sb.append(i == 0 ? "\n<th>" : "\n<td>");
                     if (column != null && column.getTextBlocks() != null) {
                         boolean first = true;
-                        for (TextBlock textBlock : column.getTextBlocks()) {
+                        for (TextPageBlock textBlock : column.getTextBlocks()) {
                             if (!first) {
                                 sb.append("<br />");
                             }

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/RedTextPosition.java

@@ -0,0 +1,100 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.beans.BeanUtils;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RedTextPosition {
+
+    private String textMatrix;
+    private float[] position;
+
+    @JsonIgnore
+    private int rotation;
+
+    @JsonIgnore
+    private float pageHeight;
+
+    @JsonIgnore
+    private float pageWidth;
+
+    private String unicode;
+
+    @JsonIgnore
+    private float dir;
+
+    // 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());
+
+        var position = new float[4];
+
+        position[0] = textPosition.getXDirAdj();
+        position[1] = textPosition.getYDirAdj();
+        position[2] = textPosition.getWidthDirAdj();
+        position[3] = textPosition.getHeightDir();
+
+        pos.setPosition(position);
+        return pos;
+    }
+
+
+    @JsonIgnore
+    public float getXDirAdj() {
+
+        return position[0];
+    }
+
+
+    @JsonIgnore
+    public float getYDirAdj() {
+
+        return position[1];
+    }
+
+
+    @JsonIgnore
+    public float getWidthDirAdj() {
+
+        return position[2];
+    }
+
+
+    @JsonIgnore
+    public float getHeightDir() {
+
+        return position[3];
+    }
+
+}

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

@@ -0,0 +1,49 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
+import lombok.Getter;
+
+public class SearchableText {
+
+    @Getter
+    private final List<TextPositionSequence> sequences = new ArrayList<>();
+
+
+    public void add(TextPositionSequence textPositionSequence) {
+
+        sequences.add(textPositionSequence);
+    }
+
+
+    public void addAll(List<TextPositionSequence> textPositionSequences) {
+
+        sequences.addAll(textPositionSequences);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return buildString(sequences);
+    }
+
+
+    public static String buildString(List<TextPositionSequence> sequences) {
+
+        StringBuilder sb = new StringBuilder();
+        for (TextPositionSequence word : sequences) {
+            sb.append(word);
+            sb.append(' ');
+        }
+        String text = sb.toString();
+        text = TextNormalizationUtilities.removeHyphenLineBreaks(text);
+        text = TextNormalizationUtilities.removeLineBreaks(text);
+        text = TextNormalizationUtilities.removeRepeatingWhitespaces(text);
+        return text;
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SimplifiedSectionText.java

@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedSectionText {
+
+    private int sectionNumber;
+    private String text;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/SimplifiedText.java

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

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

@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.classification.model;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -37,13 +37,11 @@ public class StringFrequencyCounter {
 
         Map.Entry<String, Integer> mostPopular = null;
         for (Map.Entry<String, Integer> entry : countPerValue.entrySet()) {
-            if (mostPopular == null) {
-                mostPopular = entry;
-            } else if (entry.getValue() > mostPopular.getValue()) {
+            if (mostPopular == null || entry.getValue() > mostPopular.getValue()) {
                 mostPopular = entry;
             }
         }
         return mostPopular != null ? mostPopular.getKey() : null;
     }
 
-}
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/TextDirection.java

@@ -0,0 +1,47 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import lombok.Getter;
+
+@Getter
+public enum TextDirection {
+    ZERO(0f),
+    QUARTER_CIRCLE(90f),
+    HALF_CIRCLE(180f),
+    THREE_QUARTER_CIRCLE(270f);
+
+    public static final String VALUE_STRING_SUFFIX = "°";
+
+    @JsonValue
+    private final float degrees;
+    private final float radians;
+
+
+    TextDirection(float degreeValue) {
+
+        degrees = degreeValue;
+        radians = (float) Math.toRadians(degreeValue);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return degrees + VALUE_STRING_SUFFIX;
+    }
+
+
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    public static TextDirection fromDegrees(float degrees) {
+
+        for (var dir : TextDirection.values()) {
+            if (degrees == dir.degrees) {
+                return dir;
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("A value of %f is not supported by TextDirection", degrees));
+    }
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/TextPageBlock.java

@@ -0,0 +1,302 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.PageBlockType;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@Builder
+@Data
+@NoArgsConstructor
+public class TextPageBlock extends AbstractPageBlock {
+
+    @Builder.Default
+    private List<TextPositionSequence> sequences = new ArrayList<>();
+
+    @JsonIgnore
+    private int rotation;
+
+    @JsonIgnore
+    private String mostPopularWordFont;
+
+    @JsonIgnore
+    private String mostPopularWordStyle;
+
+    @JsonIgnore
+    private float mostPopularWordFontSize;
+
+    @JsonIgnore
+    private float mostPopularWordHeight;
+
+    @JsonIgnore
+    private float mostPopularWordSpaceWidth;
+
+    @JsonIgnore
+    private float highestFontSize;
+
+    @JsonIgnore
+    private PageBlockType classification;
+
+
+    @JsonIgnore
+    public TextDirection getDir() {
+
+        return sequences.get(0).getDir();
+    }
+
+
+    @JsonIgnore
+    private float getPageHeight() {
+
+        return sequences.get(0).getPageHeight();
+    }
+
+
+    @JsonIgnore
+    private float getPageWidth() {
+
+        return sequences.get(0).getPageWidth();
+    }
+
+
+    /**
+     * Returns the minX value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the minX value in pdf coordinate system
+     */
+    @JsonIgnore
+    public float getPdfMinX() {
+
+        if (getDir().getDegrees() == 90) {
+            return minY;
+        } else if (getDir().getDegrees() == 180) {
+            return getPageWidth() - maxX;
+
+        } else if (getDir().getDegrees() == 270) {
+
+            return getPageWidth() - maxY;
+        } else {
+            return minX;
+        }
+    }
+
+
+    /**
+     * Returns the maxX value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the maxX value in pdf coordinate system
+     */
+    @JsonIgnore
+    public float getPdfMaxX() {
+
+        if (getDir().getDegrees() == 90) {
+            return maxY;
+        } else if (getDir().getDegrees() == 180) {
+            return getPageWidth() - minX;
+        } else if (getDir().getDegrees() == 270) {
+            return getPageWidth() - minY;
+
+        } else {
+            return maxX;
+        }
+    }
+
+
+    /**
+     * Returns the minY value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the minY value in pdf coordinate system
+     */
+    @JsonIgnore
+    public float getPdfMinY() {
+
+        if (getDir().getDegrees() == 90) {
+            return minX;
+        } else if (getDir().getDegrees() == 180) {
+            return maxY;
+
+        } else if (getDir().getDegrees() == 270) {
+            return getPageHeight() - maxX;
+
+        } else {
+            return getPageHeight() - maxY;
+        }
+    }
+
+
+    /**
+     * Returns the maxY value in pdf coordinate system.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return the maxY value in pdf coordinate system
+     */
+    @JsonIgnore
+    public float getPdfMaxY() {
+
+        if (getDir().getDegrees() == 90) {
+            return maxX;
+        } else if (getDir().getDegrees() == 180) {
+
+            return minY;
+        } else if (getDir().getDegrees() == 270) {
+            return getPageHeight() - minX;
+        } else {
+            return getPageHeight() - minY;
+        }
+    }
+
+
+    public TextPageBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
+
+        this.minX = minX;
+        this.maxX = maxX;
+        this.minY = minY;
+        this.maxY = maxY;
+        this.sequences = sequences;
+        this.rotation = rotation;
+    }
+
+
+    public TextPageBlock union(TextPositionSequence r) {
+
+        TextPageBlock union = this.copy();
+        union.add(r);
+        return union;
+    }
+
+
+    public TextPageBlock union(TextPageBlock r) {
+
+        TextPageBlock union = this.copy();
+        union.add(r);
+        return union;
+    }
+
+
+    public void add(TextPageBlock r) {
+
+        if (r.getMinX() < minX) {
+            minX = r.getMinX();
+        }
+        if (r.getMaxX() > maxX) {
+            maxX = r.getMaxX();
+        }
+        if (r.getMinY() < minY) {
+            minY = r.getMinY();
+        }
+        if (r.getMaxY() > maxY) {
+            maxY = r.getMaxY();
+        }
+        sequences.addAll(r.getSequences());
+    }
+
+
+    public void add(TextPositionSequence r) {
+
+        if (r.getMinXDirAdj() < minX) {
+            minX = r.getMinXDirAdj();
+        }
+        if (r.getMaxXDirAdj() > maxX) {
+            maxX = r.getMaxXDirAdj();
+        }
+        if (r.getMinYDirAdj() < minY) {
+            minY = r.getMinYDirAdj();
+        }
+        if (r.getMaxYDirAdj() > maxY) {
+            maxY = r.getMaxYDirAdj();
+        }
+    }
+
+
+    public TextPageBlock copy() {
+
+        return new TextPageBlock(minX, maxX, minY, maxY, sequences, rotation);
+    }
+
+
+    public void resize(float x1, float y1, float width, float height) {
+
+        set(x1, y1, x1 + width, y1 + height);
+    }
+
+
+    public void set(float x1, float y1, float x2, float y2) {
+
+        this.minX = Math.min(x1, x2);
+        this.maxX = Math.max(x1, x2);
+        this.minY = Math.min(y1, y2);
+        this.maxY = Math.max(y1, y2);
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder builder = new StringBuilder();
+
+        for (int i = 0; i < sequences.size(); i++) {
+            String sequenceAsString = sequences.get(i).toString();
+            // Fix for missing Whitespace. This is recognized in getSequences method. See PDFTextStripper Line 1730.
+            if (i != 0 && sequences.get(i - 1).charAt(sequences.get(i - 1).length() - 1) != ' ' && sequenceAsString.charAt(0) != ' ') {
+                builder.append(' ');
+            }
+            builder.append(sequenceAsString);
+        }
+
+        return builder.toString();
+
+    }
+
+
+    @Override
+    @JsonIgnore
+    public String getText() {
+
+        StringBuilder sb = new StringBuilder();
+
+        TextPositionSequence previous = null;
+        for (TextPositionSequence word : sequences) {
+            if (previous != null) {
+                if (Math.abs(previous.getMaxYDirAdj() - word.getMaxYDirAdj()) > word.getTextHeight()) {
+                    sb.append('\n');
+                } else {
+                    sb.append(' ');
+                }
+            }
+            sb.append(word.toString());
+            previous = word;
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString());
+
+    }
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/model/text/TextPositionSequence.java

@@ -0,0 +1,301 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.text.TextPosition;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties({"empty"})
+public class TextPositionSequence implements CharSequence {
+
+    public static final int HEIGHT_PADDING = 2;
+    private int page;
+    private List<RedTextPosition> textPositions = new ArrayList<>();
+
+    private TextDirection dir;
+    private int rotation;
+    private float pageHeight;
+    private float pageWidth;
+
+
+    public TextPositionSequence(int page) {
+
+        this.page = page;
+    }
+
+
+    public TextPositionSequence(List<TextPosition> textPositions, int page) {
+
+        this.textPositions = textPositions.stream().map(RedTextPosition::fromTextPosition).collect(Collectors.toList());
+        this.page = page;
+        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
+        this.rotation = textPositions.get(0).getRotation();
+        this.pageHeight = textPositions.get(0).getPageHeight();
+        this.pageWidth = textPositions.get(0).getPageWidth();
+    }
+
+
+    @Override
+    public int length() {
+
+        return textPositions.size();
+    }
+
+
+    @Override
+    public char charAt(int index) {
+
+        RedTextPosition textPosition = textPositionAt(index);
+        String text = textPosition.getUnicode();
+        return text.charAt(0);
+    }
+
+
+    public char charAt(int index, boolean caseInSensitive) {
+
+        RedTextPosition textPosition = textPositionAt(index);
+        String text = textPosition.getUnicode();
+        return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
+    }
+
+
+    @Override
+    public TextPositionSequence subSequence(int start, int end) {
+
+        var textPositionSequence = new TextPositionSequence();
+        textPositionSequence.textPositions = textPositions.subList(start, end);
+        textPositionSequence.page = page;
+        textPositionSequence.dir = dir;
+        textPositionSequence.rotation = rotation;
+        textPositionSequence.pageHeight = pageHeight;
+        textPositionSequence.pageWidth = pageWidth;
+
+        return textPositionSequence;
+    }
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder builder = new StringBuilder(length());
+        for (int i = 0; i < length(); i++) {
+            builder.append(charAt(i));
+        }
+        return builder.toString();
+    }
+
+
+    public RedTextPosition textPositionAt(int index) {
+
+        return textPositions.get(index);
+    }
+
+
+    public void add(TextPositionSequence textPositionSequence, RedTextPosition textPosition) {
+
+        this.textPositions.add(textPosition);
+        this.page = textPositionSequence.getPage();
+        this.dir = textPositionSequence.getDir();
+        this.rotation = textPositionSequence.getRotation();
+        this.pageHeight = textPositionSequence.getPageHeight();
+        this.pageWidth = textPositionSequence.getPageWidth();
+    }
+
+
+    public void add(TextPosition textPosition) {
+
+        this.textPositions.add(RedTextPosition.fromTextPosition(textPosition));
+
+        this.dir = TextDirection.fromDegrees(textPositions.get(0).getDir());
+        this.rotation = textPositions.get(0).getRotation();
+        this.pageHeight = textPositions.get(0).getPageHeight();
+        this.pageWidth = textPositions.get(0).getPageWidth();
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted minX value
+     */
+    @JsonIgnore
+    public float getMinXDirAdj() {
+
+        return textPositions.get(0).getXDirAdj();
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted maxX value
+     */
+    @JsonIgnore
+    public float getMaxXDirAdj() {
+
+        return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING;
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted minY value. The upper border of the bounding box of the word.
+     */
+    @JsonIgnore
+    public float getMinYDirAdj() {
+
+        return textPositions.get(0).getYDirAdj() - getTextHeight();
+
+    }
+
+
+    /**
+     * This value is adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     * This method ignores the page rotation but takes the text rotation and adjusts the coordinates to awt.
+     *
+     * @return the text direction adjusted maxY value. The lower border of the bounding box of the word.
+     */
+    @JsonIgnore
+    public float getMaxYDirAdj() {
+
+        return textPositions.get(0).getYDirAdj();
+
+    }
+
+
+    @JsonIgnore
+    public float getTextHeight() {
+
+        return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
+    }
+
+
+    @JsonIgnore
+    public float getHeight() {
+
+        return getMaxYDirAdj() - getMinYDirAdj();
+    }
+
+
+    @JsonIgnore
+    public float getWidth() {
+
+        return getMaxXDirAdj() - getMinXDirAdj();
+    }
+
+
+    @JsonIgnore
+    public String getFont() {
+
+        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
+    }
+
+
+    @JsonIgnore
+    public String getFontStyle() {
+
+        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();
+
+        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
+            return "bold, italic";
+        } else if (lowercaseFontName.contains("bold")) {
+            return "bold";
+        } else if (lowercaseFontName.contains("italic")) {
+            return "italic";
+        } else {
+            return "standard";
+        }
+
+    }
+
+
+    @JsonIgnore
+    public float getFontSize() {
+
+        return textPositions.get(0).getFontSizeInPt();
+    }
+
+
+    @JsonIgnore
+    public float getSpaceWidth() {
+
+        return textPositions.get(0).getWidthOfSpace();
+    }
+
+
+    /**
+     * This returns the bounding box of the word in Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     *
+     * @return bounding box of the word in Pdf Coordinate System
+     */
+    @JsonIgnore
+    @SneakyThrows
+    public Rectangle getRectangle() {
+
+        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, this, rotation, dir);
+
+        float textHeight = getTextHeight();
+
+        RedTextPosition firstTextPos = textPositions.get(0);
+        RedTextPosition lastTextPos = textPositions.get(textPositions.size() - 1);
+
+        Point2D bottomLeft = new Point2D.Double(firstTextPos.getXDirAdj(), firstTextPos.getYDirAdj() - HEIGHT_PADDING);
+        Point2D topRight = new Point2D.Double(lastTextPos.getXDirAdj() + lastTextPos.getWidthDirAdj(), lastTextPos.getYDirAdj() + textHeight + HEIGHT_PADDING);
+
+        AffineTransform transform = new AffineTransform();
+        if (dir == TextDirection.ZERO || dir == TextDirection.HALF_CIRCLE) {
+            transform.rotate(dir.getRadians(), pageWidth / 2f, pageHeight / 2f);
+            transform.translate(0f, pageHeight + textHeight);
+            transform.scale(1., -1.);
+        } else if (dir == TextDirection.QUARTER_CIRCLE) {
+            transform.rotate(dir.getRadians(), pageWidth / 2f, pageWidth / 2f);
+            transform.translate(0f, pageWidth + textHeight);
+            transform.scale(1., -1.);
+        } else {
+            transform.rotate(dir.getRadians(), pageHeight / 2f, pageHeight / 2f);
+            transform.translate(0f, pageWidth + textHeight);
+            transform.scale(1., -1.);
+        }
+
+        bottomLeft = transform.transform(bottomLeft, null);
+        topRight = transform.transform(topRight, null);
+
+        return new Rectangle( //
+                new Point((float) bottomLeft.getX(), (float) bottomLeft.getY()),
+                (float) (topRight.getX() - bottomLeft.getX()),
+                (float) (topRight.getY() - bottomLeft.getY()),
+                page);
+    }
+
+}

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

@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UnclassifiedText {
+
+    private List<TextPageBlock> textBlocks;
+
+}

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/classification/parsing/LegacyPDFStreamEngine.java

@@ -0,0 +1,384 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.parsing;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.fontbox.ttf.TrueTypeFont;
+import org.apache.fontbox.util.BoundingBox;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
+import org.apache.pdfbox.contentstream.operator.DrawObject;
+import org.apache.pdfbox.contentstream.operator.state.Concatenate;
+import org.apache.pdfbox.contentstream.operator.state.Restore;
+import org.apache.pdfbox.contentstream.operator.state.Save;
+import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
+import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
+import org.apache.pdfbox.contentstream.operator.text.BeginText;
+import org.apache.pdfbox.contentstream.operator.text.EndText;
+import org.apache.pdfbox.contentstream.operator.text.MoveText;
+import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
+import org.apache.pdfbox.contentstream.operator.text.NextLine;
+import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
+import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
+import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
+import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
+import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
+import org.apache.pdfbox.contentstream.operator.text.ShowText;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDCIDFont;
+import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
+import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
+import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
+import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
+import org.apache.pdfbox.text.TextPosition;
+import org.apache.pdfbox.util.Matrix;
+import org.apache.pdfbox.util.Vector;
+
+/**
+ * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
+ * <p>
+ * This class exists only so that we don't break the code of users who have their own subclasses of
+ * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
+ * with a heuristic implementation which is backwards compatible.
+ * <p>
+ * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+ * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
+ */
+@SuppressWarnings({"PMD", "checkstyle:all"})
+class LegacyPDFStreamEngine extends PDFStreamEngine {
+
+    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
+
+    private int pageRotation;
+    private PDRectangle pageSize;
+    private Matrix translateMatrix;
+    private final GlyphList glyphList;
+    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
+
+
+    /**
+     * Constructor.
+     */
+    LegacyPDFStreamEngine() throws IOException {
+
+        addOperator(new BeginText());
+        addOperator(new Concatenate());
+        addOperator(new DrawObject()); // special text version
+        addOperator(new EndText());
+        addOperator(new SetGraphicsStateParameters());
+        addOperator(new Save());
+        addOperator(new Restore());
+        addOperator(new NextLine());
+        addOperator(new SetCharSpacing());
+        addOperator(new MoveText());
+        addOperator(new MoveTextSetLeading());
+        addOperator(new SetFontAndSize());
+        addOperator(new ShowText());
+        addOperator(new ShowTextAdjusted());
+        addOperator(new SetTextLeading());
+        addOperator(new SetMatrix());
+        addOperator(new SetTextRenderingMode());
+        addOperator(new SetTextRise());
+        addOperator(new SetWordSpacing());
+        addOperator(new SetTextHorizontalScaling());
+        addOperator(new ShowTextLine());
+        addOperator(new ShowTextLineAndSpace());
+
+        // load additional glyph list for Unicode mapping
+        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
+        InputStream input = GlyphList.class.getResourceAsStream(path);
+        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
+    }
+
+
+    /**
+     * This will initialize and process the contents of the stream.
+     *
+     * @param page the page to process
+     * @throws java.io.IOException if there is an error accessing the stream.
+     */
+    @Override
+    public void processPage(PDPage page) throws IOException {
+
+        this.pageRotation = page.getRotation();
+        this.pageSize = page.getCropBox();
+
+        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0) {
+            translateMatrix = null;
+        } else {
+            // translation matrix for cropbox
+            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
+        }
+        super.processPage(page);
+    }
+
+
+    /**
+     * Called when a glyph is to be processed. The heuristic calculations here were originally
+     * written by Ben Litchfield for PDFStreamEngine.
+     */
+    @Override
+    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) throws IOException {
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        PDGraphicsState state = getGraphicsState();
+        Matrix ctm = state.getCurrentTransformationMatrix();
+        float fontSize = state.getTextState().getFontSize();
+        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
+        Matrix textMatrix = getTextMatrix();
+
+        float displacementX = displacement.getX();
+        // the sorting algorithm is based on the width of the character. As the displacement
+        // for vertical characters doesn't provide any suitable value for it, we have to 
+        // calculate our own
+        if (font.isVertical()) {
+            displacementX = font.getWidth(code) / 1000;
+            // there may be an additional scaling factor for true type fonts
+            TrueTypeFont ttf = null;
+            if (font instanceof PDTrueTypeFont) {
+                ttf = ((PDTrueTypeFont) font).getTrueTypeFont();
+            } else if (font instanceof PDType0Font) {
+                PDCIDFont cidFont = ((PDType0Font) font).getDescendantFont();
+                if (cidFont instanceof PDCIDFontType2) {
+                    ttf = ((PDCIDFontType2) cidFont).getTrueTypeFont();
+                }
+            }
+            if (ttf != null && ttf.getUnitsPerEm() != 1000) {
+                displacementX *= 1000f / ttf.getUnitsPerEm();
+            }
+        }
+
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        // (modified) combined displacement, this is calculated *without* taking the character
+        // spacing and word spacing into account, due to legacy code in TextStripper
+        float tx = displacementX * fontSize * horizontalScaling;
+        float ty = displacement.getY() * fontSize;
+
+        // (modified) combined displacement matrix
+        Matrix td = Matrix.getTranslateInstance(tx, ty);
+
+        // (modified) text rendering matrix
+        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
+        float nextX = nextTextRenderingMatrix.getTranslateX();
+        float nextY = nextTextRenderingMatrix.getTranslateY();
+
+        // (modified) width and height calculations
+        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
+        Float fontHeight = fontHeightMap.get(font.getCOSObject());
+        if (fontHeight == null) {
+            fontHeight = computeFontHeight(font);
+            fontHeightMap.put(font.getCOSObject(), fontHeight);
+        }
+        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
+
+        //
+        // start of the original method
+        //
+
+        // Note on variable names. There are three different units being used in this code.
+        // Character sizes are given in glyph units, text locations are initially given in text
+        // units, and we want to save the data in display units. The variable names should end with
+        // Text or Disp to represent if the values are in text or disp units (no glyph units are
+        // saved).
+
+        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
+        if (font instanceof PDType3Font) {
+            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
+        }
+
+        float spaceWidthText = 0;
+        try {
+            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
+            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
+        } catch (Throwable exception) {
+            LOG.warn(exception, exception);
+        }
+
+        if (spaceWidthText == 0) {
+            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
+            // the average space width appears to be higher than necessary so make it smaller
+            spaceWidthText *= .80f;
+        }
+        if (spaceWidthText == 0) {
+            spaceWidthText = 1.0f; // if could not find font, use a generic value
+        }
+
+        // the space width has to be transformed into display units
+        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
+
+        // use our additional glyph list for Unicode mapping
+        String unicodeMapping = font.toUnicode(code, glyphList);
+
+        // when there is no Unicode mapping available, Acrobat simply coerces the character code
+        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
+        // this, which is why we leave it until this point in PDFTextStreamEngine.
+        if (unicodeMapping == null) {
+            if (font instanceof PDSimpleFont) {
+                char c = (char) code;
+                unicodeMapping = new String(new char[]{c});
+            } else {
+                // Acrobat doesn't seem to coerce composite font's character codes, instead it
+                // skips them. See the "allah2.pdf" TestTextStripper file.
+                return;
+            }
+        }
+
+        // adjust for cropbox if needed
+        Matrix translatedTextRenderingMatrix;
+        if (translateMatrix == null) {
+            translatedTextRenderingMatrix = textRenderingMatrix;
+        } else {
+            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
+            nextX -= pageSize.getLowerLeftX();
+            nextY -= pageSize.getLowerLeftY();
+        }
+
+        // This is a hack for unicode letter with 2 chars e.g. RA see unicodeProblem.pdf
+        if (unicodeMapping.length() == 2) {
+            processTextPosition(new TextPosition(pageRotation,
+                    pageSize.getWidth(),
+                    pageSize.getHeight(),
+                    translatedTextRenderingMatrix,
+                    nextX,
+                    nextY,
+                    Math.abs(dyDisplay),
+                    dxDisplay,
+                    Math.abs(spaceWidthDisplay),
+                    Character.toString(unicodeMapping.charAt(0)),
+                    new int[]{code},
+                    font,
+                    fontSize,
+                    (int) (fontSize * textMatrix.getScalingFactorX())));
+            processTextPosition(new TextPosition(pageRotation,
+                    pageSize.getWidth(),
+                    pageSize.getHeight(),
+                    translatedTextRenderingMatrix,
+                    nextX,
+                    nextY,
+                    Math.abs(dyDisplay),
+                    dxDisplay,
+                    Math.abs(spaceWidthDisplay),
+                    Character.toString(unicodeMapping.charAt(1)),
+                    new int[]{code},
+                    font,
+                    fontSize,
+                    (int) (fontSize * textMatrix.getScalingFactorX())));
+        } else {
+
+            processTextPosition(new TextPosition(pageRotation,
+                    pageSize.getWidth(),
+                    pageSize.getHeight(),
+                    translatedTextRenderingMatrix,
+                    nextX,
+                    nextY,
+                    Math.abs(dyDisplay),
+                    dxDisplay,
+                    Math.abs(spaceWidthDisplay),
+                    unicodeMapping,
+                    new int[]{code},
+                    font,
+                    fontSize,
+                    (int) (fontSize * textMatrix.getScalingFactorX())));
+        }
+    }
+
+
+    /**
+     * Compute the font height. Override this if you want to use own calculations.
+     *
+     * @param font the font.
+     * @return the font height.
+     * @throws IOException if there is an error while getting the font bounding box.
+     */
+    protected float computeFontHeight(PDFont font) throws IOException {
+
+        BoundingBox bbox = font.getBoundingBox();
+        if (bbox.getLowerLeftY() < Short.MIN_VALUE) {
+            // PDFBOX-2158 and PDFBOX-3130
+            // files by Salmat eSolutions / ClibPDF Library
+            bbox.setLowerLeftY(-(bbox.getLowerLeftY() + 65536));
+        }
+        // 1/2 the bbox is used as the height todo: why?
+        float glyphHeight = bbox.getHeight() / 2;
+
+        // sometimes the bbox has very high values, but CapHeight is OK
+        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
+        if (fontDescriptor != null) {
+            float capHeight = fontDescriptor.getCapHeight();
+            if (Float.compare(capHeight, 0) != 0 && (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0)) {
+                glyphHeight = capHeight;
+            }
+            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
+            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
+            float ascent = fontDescriptor.getAscent();
+            float descent = fontDescriptor.getDescent();
+            if (capHeight > ascent && ascent > 0 && descent < 0 && ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0)) {
+                glyphHeight = (ascent - descent) / 2;
+            }
+        }
+
+        // transformPoint from glyph space -> text space
+        float height;
+        if (font instanceof PDType3Font) {
+            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
+        } else {
+            height = glyphHeight / 1000;
+        }
+
+        return height;
+    }
+
+
+    /**
+     * A method provided as an event interface to allow a subclass to perform some specific
+     * functionality when text needs to be processed.
+     *
+     * @param text The text to be processed.
+     */
+    protected void processTextPosition(TextPosition text) {
+        // subclasses can override to provide specific functionality
+    }
+
+}

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

@@ -1,8 +1,9 @@
-package com.iqser.red.service.redaction.v1.server.parsing;
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.parsing;
 
 import java.awt.geom.Point2D;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.pdfbox.contentstream.operator.Operator;
@@ -30,11 +31,12 @@ import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSNumber;
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.text.TextPosition;
 
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Ruling;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -43,19 +45,21 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
 
-    @Getter
-    private int maxCharWidths;
-
-    @Getter
-    private int maxCharHeight;
-
     @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 int minCharWidth;
+    @Getter
+    private int maxCharWidth;
+    @Getter
+    private int minCharHeight;
+    @Getter
+    private int maxCharHeight;
 
     private float path_x;
     private float path_y;
@@ -63,7 +67,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
     @Setter
     private int pageNumber;
 
+
     public PDFLinesTextStripper() throws IOException {
+
         super();
         this.addOperator(new SetStrokingColorSpace());
         this.addOperator(new SetNonStrokingColorSpace());
@@ -87,9 +93,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         this.addOperator(new SetLineWidth());
     }
 
+
     @Override
-    protected void processOperator(Operator operator, List<COSBase> arguments)
-            throws IOException {
+    protected void processOperator(Operator operator, List<COSBase> arguments) throws IOException {
 
         String operation = operator.getName();
 
@@ -168,12 +174,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
             case OperatorName.ENDPATH:
                 graphicsPath.clear();
                 break;
+
         }
 
         super.processOperator(operator, arguments);
     }
 
+
     private float floatValue(COSBase value) {
+
         if (value instanceof COSNumber) {
             return ((COSNumber) value).floatValue();
         } else {
@@ -181,76 +190,138 @@ public class PDFLinesTextStripper extends PDFTextStripper {
         }
     }
 
+
     private Point2D.Float transformPosition(float x, float y) {
+
         return super.transformedPoint(x, y);
     }
 
+
     private void addVisibleRulings(List<Ruling> path, boolean stroke) throws IOException {
 
         try {
-            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor().toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
+            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
+                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
                 rulings.addAll(path);
             }
         } catch (UnsupportedOperationException e) {
-            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor().getColorSpace().getName() + " does not support toRGB");
+            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor()
+                    .getColorSpace()
+                    .getName() + " does not support toRGB");
         }
     }
 
+
     @Override
     public void writeString(String text, List<TextPosition> textPositions) throws IOException {
 
         int startIndex = 0;
+        RedTextPosition previous = null;
+
+        textPositions.sort(Comparator.comparing(TextPosition::getXDirAdj));
+
         for (int i = 0; i <= textPositions.size() - 1; i++) {
 
-            int charHeight = (int) textPositions.get(i).getHeightDir();
-            if(charHeight > maxCharHeight){
-                maxCharHeight = charHeight;
+            if (!textPositionSequences.isEmpty()) {
+                previous = textPositionSequences.get(textPositionSequences.size() - 1)
+                        .getTextPositions()
+                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
             }
 
             int charWidth = (int) textPositions.get(i).getWidthDirAdj();
-            if(charWidth > maxCharWidths){
-                maxCharWidths = charWidth;
+            if (charWidth < minCharWidth) {
+                minCharWidth = charWidth;
+            }
+            if (charWidth > maxCharWidth) {
+                maxCharWidth = charWidth;
             }
 
-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            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).getUnicode().equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
                 startIndex++;
                 continue;
             }
 
             // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
                 List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
                 startIndex = i;
             }
 
-            if (i > 0 && textPositions.get(i).getUnicode().equals(" ") && i <= textPositions.size() - 2) {
+            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(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
                     textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                 }
+                startIndex = i;
+            }
+
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t")) && 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") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
+
+                    // Remove false sequence ends (whitespaces)
+                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                        for (TextPosition textPosition : sublist) {
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(textPosition);
+                        }
+                    } else {
+                        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(" ")) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
             sublist = sublist.subList(0, sublist.size() - 1);
         }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                .getUnicode()
+                .equals("\t")))) {
+            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                for (TextPosition t : sublist) {
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                }
+            } else {
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+            }
         }
         super.writeString(text);
-
     }
 
+
     @Override
     public String getText(PDDocument doc) throws IOException {
 
-        maxCharWidths = 0;
-        maxCharWidths = 0;
+        minCharWidth = Integer.MAX_VALUE;
+        maxCharWidth = 0;
+        minCharHeight = Integer.MAX_VALUE;
+        maxCharHeight = 0;
         textPositionSequences.clear();
         rulings.clear();
         graphicsPath.clear();
@@ -261,4 +332,4 @@ public class PDFLinesTextStripper extends PDFTextStripper {
 
     }
 
-}
+}

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

@@ -0,0 +1,25 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service;
+
+import static java.util.stream.Collectors.toSet;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.Orientation;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Ruling;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.StringFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.utils.RulingTextDirAdjustUtil;
+
+public interface BlockificationService {
+
+    ClassificationPage blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines);
+}

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

@@ -0,0 +1,164 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Point;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.AbstractPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationPage;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.FloatFrequencyCounter;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.Cell;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.table.TablePageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.text.TextPageBlock;
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.utils.PositionUtils;
+
+@Service
+public class BodyTextFrameService {
+
+    private static final float APPROXIMATE_HEADER_LINE_COUNT = 2.9f;
+
+
+    /**
+     * Adjusts and sets the body text frame to a page.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     * The aspect ratio of the page is also regarded.
+     *
+     * @param page                   The page
+     * @param bodyTextFrame          frame that contains the main text on portrait pages
+     * @param landscapeBodyTextFrame frame that contains the main text on landscape pages
+     */
+    public void setBodyTextFrameAdjustedToPage(ClassificationPage page, Rectangle bodyTextFrame, Rectangle landscapeBodyTextFrame) {
+
+        Rectangle textFrame = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
+
+        if (page.getPageWidth() > page.getPageHeight() && page.getRotation() == 270) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getY(), page.getPageHeight() - textFrame.getTopLeft().getX() - textFrame.getWidth()),
+                    textFrame.getHeight(),
+                    textFrame.getWidth(),
+                    0);
+        } else if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getY(), textFrame.getTopLeft().getX()), textFrame.getHeight(), textFrame.getWidth(), page.getPageNumber());
+        } else if (page.getRotation() == 180) {
+            textFrame = new Rectangle(new Point(textFrame.getTopLeft().getX(), page.getPageHeight() - textFrame.getTopLeft().getY() - textFrame.getHeight()),
+                    textFrame.getWidth(),
+                    textFrame.getHeight(),
+                    0);
+        }
+        page.setBodyTextFrame(textFrame);
+    }
+
+
+    /**
+     * Calculates the frame that contains the main text, text outside the frame will be e.g. headers or footers.
+     * Note: This needs to use Pdf Coordinate System where {0,0} rotated with the page rotation.
+     * 0 -> LowerLeft
+     * 90 -> UpperLeft
+     * 180 -> UpperRight
+     * 270 -> LowerRight
+     * The aspect ratio of the page is also regarded.
+     *
+     * @param pages                   List of all pages
+     * @param documentFontSizeCounter Statistics of the document
+     * @param landscape               Calculate for landscape or portrait
+     * @return Rectangle of the text frame
+     */
+    public Rectangle calculateBodyTextFrame(List<ClassificationPage> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+
+        BodyTextFrameExpansionsRectangle expansionsRectangle = new BodyTextFrameExpansionsRectangle();
+
+        for (ClassificationPage page : pages) {
+
+            if (page.getTextBlocks().isEmpty() || landscape != page.isLandscape()) {
+                continue;
+            }
+
+            for (AbstractPageBlock container : page.getTextBlocks()) {
+
+                if (container instanceof TextPageBlock) {
+                    TextPageBlock textBlock = (TextPageBlock) container;
+                    if (textBlock.getMostPopularWordFont() == null || textBlock.getMostPopularWordStyle() == null) {
+                        continue;
+                    }
+
+                    float approxLineCount = PositionUtils.getApproxLineCount(textBlock);
+                    if (approxLineCount < APPROXIMATE_HEADER_LINE_COUNT) {
+                        continue;
+                    }
+
+                    if (documentFontSizeCounter.getMostPopular() != null && textBlock.getMostPopularWordFontSize() >= documentFontSizeCounter.getMostPopular()) {
+
+                        expandRectangle(textBlock, page, expansionsRectangle);
+                    }
+                }
+
+                if (container instanceof TablePageBlock) {
+                    TablePageBlock table = (TablePageBlock) container;
+                    for (List<Cell> row : table.getRows()) {
+                        for (Cell cell : row) {
+
+                            if (cell == null || cell.getTextBlocks() == null) {
+                                continue;
+                            }
+                            for (TextPageBlock textBlock : cell.getTextBlocks()) {
+                                expandRectangle(textBlock, page, expansionsRectangle);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return new Rectangle(new Point(expansionsRectangle.minX, expansionsRectangle.minY),
+                expansionsRectangle.maxX - expansionsRectangle.minX,
+                expansionsRectangle.maxY - expansionsRectangle.minY,
+                0);
+    }
+
+
+    private void expandRectangle(TextPageBlock textBlock, ClassificationPage page, BodyTextFrameExpansionsRectangle expansionsRectangle) {
+
+        if (page.getPageWidth() > page.getPageHeight() && page.getRotation() != 0) {
+            if (textBlock.getPdfMinY() < expansionsRectangle.minX) {
+                expansionsRectangle.minX = textBlock.getPdfMinY();
+            }
+            if (textBlock.getPdfMaxY() > expansionsRectangle.maxX) {
+                expansionsRectangle.maxX = textBlock.getPdfMaxY();
+            }
+            if (textBlock.getPdfMinX() < expansionsRectangle.minY) {
+                expansionsRectangle.minY = textBlock.getPdfMinX();
+            }
+            if (textBlock.getPdfMaxX() > expansionsRectangle.maxY) {
+                expansionsRectangle.maxY = textBlock.getPdfMaxX();
+            }
+        } else {
+            if (textBlock.getPdfMinX() < expansionsRectangle.minX) {
+                expansionsRectangle.minX = textBlock.getPdfMinX();
+            }
+            if (textBlock.getPdfMaxX() > expansionsRectangle.maxX) {
+                expansionsRectangle.maxX = textBlock.getPdfMaxX();
+            }
+            if (textBlock.getPdfMinY() < expansionsRectangle.minY) {
+                expansionsRectangle.minY = textBlock.getPdfMinY();
+            }
+            if (textBlock.getPdfMaxY() > expansionsRectangle.maxY) {
+                expansionsRectangle.maxY = textBlock.getPdfMaxY();
+            }
+        }
+    }
+
+
+    private class BodyTextFrameExpansionsRectangle {
+
+        float minX = 10000;
+        float maxX = -100;
+        float minY = 10000;
+        float maxY = -100;
+
+    }
+
+}

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

@@ -0,0 +1,7 @@
+package com.iqser.red.service.redaction.v1.server.layoutparsing.classification.service;
+
+import com.iqser.red.service.redaction.v1.server.layoutparsing.classification.model.ClassificationDocument;
+
+public interface ClassificationService {
+    void classifyDocument(ClassificationDocument document);
+}