RM-76: Ignore excluded page logic in stored redactionLog, always set value in RedactionLogMerge

Merge branch 'RED-7918-processremoval' into 'release/3.222.x'
RED-7918 - RM-62: "Last Modified" date not updated after change See merge request redactmanager/redaction-service!205
2023-12-04 16:14:38 +01:00 · 2023-11-23 08:46:57 +01:00 · 2023-11-23 08:46:57 +01:00 · 2023-10-26 14:28:15 +02:00 · 2023-10-25 12:57:42 +02:00 · 2023-10-25 12:57:42 +02:00
376 changed files with 3924419 additions and 3659 deletions
@@ -0,0 +1,6 @@
+variables:
+  SONAR_PROJECT_KEY: 'RED_redaction-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/maven_java.yml'
@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.

 ## [Unreleased]
@@ -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>8.1.3</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>
@@ -1,177 +0,0 @@
-package buildjob;
-
-import java.time.DayOfWeek;
-import java.time.LocalTime;
-
-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.api.builders.Variable;
-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.builders.trigger.RepositoryPollingTrigger;
-import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
-import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.util.BambooServer;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
-import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
-
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
-
-/**
- * Plan configuration for Bamboo.
- * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
- */
-@BambooSpec
-public class PlanSpec {
-
-    private static final String SERVICE_NAME = "redaction-service";
-
-    private static final String JVM_ARGS =" -Xmx4g -XX:+ExitOnOutOfMemoryError -XX:SurvivorRatio=2 -XX:NewRatio=1 -XX:InitialTenuringThreshold=16 -XX:MaxTenuringThreshold=16 -XX:InitiatingHeapOccupancyPercent=35 ";
-
-    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
-
-    /**
-     * 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);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        bambooServer.publish(secPlan);
-        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
-        bambooServer.publish(secPlanPermission);
-    }
-
-    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
-        Permissions permission = new Permissions()
-                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("devplant", 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)")
-                .variables(new Variable("maven_add_param", ""))
-                .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")
-                                                .cleanCheckout(true)
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Build")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                                .argument(SERVICE_NAME),
-                                        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.8.4-openjdk-17-slim")
-                                                .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());
-    }
-
-    public Plan createSecBuild() {
-        return new Plan(
-                project(),
-                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
-                .description("Security Analysis 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")
-                                                .cleanCheckout(true)
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Sonar")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                                .argument(SERVICE_NAME))
-                                .dockerConfiguration(
-                                        new DockerConfiguration()
-                                                .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                                .dockerRunArguments("--net=host")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
-                .linkedRepositories("RED / " + SERVICE_NAME)
-                .triggers(
-                        new ScheduledTrigger()
-                                .scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranchMatching("release.*")
-                        .notificationForCommitters());
-    }
-}
@@ -1,64 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
-then
-    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i minor)"
-    echo "new release on master with version $newVersion"
-elif [[ "$bamboo_planRepository_branchName" == release* ]]
-then
-    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i patch)"
-    echo "new release on $bamboo_planRepository_branchName with version $newVersion"
-elif [[ "${bamboo_version_tag}" != "dev" ]]
-then
-    newVersion="${bamboo_version_tag}"
-    echo "new special version bild with $newVersion"
-else
-    mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        ${bamboo_maven_add_param} \
-        clean install \
-        -Djava.security.egd=file:/dev/./urandomelse
-    echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-    exit 0
-fi
-
-echo "gitTag=${newVersion}" > git.tag
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    ${bamboo_maven_add_param} \
-    versions:set \
-    -DnewVersion=${newVersion}
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    ${bamboo_maven_add_param} \
-    versions:set  \
-    -DnewVersion=${newVersion}
-
-mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean deploy \
-    ${bamboo_maven_add_param} \
-    -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
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    package
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    docker:push
@@ -1,44 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-echo "build jar binaries"
-mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    --no-transfer-progress \
-    clean install \
-    -Djava.security.egd=file:/dev/./urandomelse
-
-echo "dependency-check:aggregate"
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    org.owasp:dependency-check-maven:aggregate
-
-if [[ -z "${bamboo_repository_pr_key}" ]]
-then
-    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-else
-    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi
@@ -1,19 +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);
-
-        Plan secPlan = new PlanSpec().createSecBuild();
-        EntityPropertiesBuilders.build(secPlan);
-    }
-}
@@ -13,7 +13,6 @@
    <packaging>pom</packaging>

    <modules>
-        <module>bamboo-specs</module>
        <module>redaction-service-v1</module>
        <module>redaction-service-image-v1</module>
    </modules>
@@ -3,10 +3,10 @@
         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.2.0</version>
-        <relativePath />
+        <version>0.1.0</version>
+        <relativePath/>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -1,4 +1,4 @@
-FROM red/redaction-service-base-v1:1.0.0
+FROM red/redaction-service-base-v1:2.0.0

 ARG PLATFORM_JAR

@@ -5,8 +5,8 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.10.0</version>
-        <relativePath />
+        <version>1.13.0</version>
+        <relativePath/>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -29,15 +29,10 @@

    <dependencyManagement>
        <dependencies>
-            <dependency>
-                <groupId>com.dslplatform</groupId>
-                <artifactId>dsl-json-java8</artifactId>
-                <version>${dsljson.version}</version>
-            </dependency>
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.13.0</version>
+                <version>1.20.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -60,7 +55,7 @@
                <plugin>
                    <groupId>org.sonarsource.scanner.maven</groupId>
                    <artifactId>sonar-maven-plugin</artifactId>
-                    </plugin>
+                </plugin>
                <plugin>
                    <groupId>org.owasp</groupId>
                    <artifactId>dependency-check-maven</artifactId>
@@ -71,6 +66,12 @@
                <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>
@@ -12,7 +12,7 @@
    <artifactId>redaction-service-api-v1</artifactId>

    <properties>
-        <persistence-service.version>1.166.0</persistence-service.version>
+        <persistence-service.version>1.299.0</persistence-service.version>
    </properties>

    <dependencies>
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -1,6 +1,9 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.Set;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -31,6 +34,7 @@ public class AnalyzeResult {

    private ManualRedactions manualRedactions;

+    private Set<FileAttribute> addedFileAttributes;

 }

@@ -2,6 +2,14 @@ package com.iqser.red.service.redaction.v1.model;

 public enum ArgumentType {

-    INTEGER, BOOLEAN, STRING, FILE_ATTRIBUTE, REGEX, TYPE, RULE_NUMBER, LEGAL_BASIS, REFERENCE_TYPE
+    INTEGER,
+    BOOLEAN,
+    STRING,
+    FILE_ATTRIBUTE,
+    REGEX,
+    TYPE,
+    RULE_NUMBER,
+    LEGAL_BASIS,
+    REFERENCE_TYPE

 }
@@ -16,4 +16,5 @@ public class Change {
    private int analysisNumber;
    private ChangeType type;
    private OffsetDateTime dateTime;
+
 }
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

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

 public enum Engine {
-    DICTIONARY, NER, RULE
+    DICTIONARY,
+    NER,
+    RULE
 }
@@ -18,4 +18,5 @@ public class ImportedRedaction {

    @Builder.Default
    private List<Rectangle> positions = new ArrayList<>();
+
 }
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,10 +13,12 @@ import java.util.Map;

@Data
@Builder
+@CompiledJson
@NoArgsConstructor
@AllArgsConstructor
 public class ImportedRedactions {

    @Builder.Default
    private Map<Integer, List<ImportedRedaction>> importedRedactions = new HashMap<>();
+
 }
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.model;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.BaseAnnotation;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,7 +25,9 @@ public class ManualChange {
    private String userId;
    private Map<String, String> propertyChanges = new HashMap<>();

+
    public static ManualChange from(BaseAnnotation baseAnnotation) {
+
        ManualChange manualChange = new ManualChange();
        manualChange.annotationStatus = baseAnnotation.getStatus();
        manualChange.processedDate = baseAnnotation.getProcessedDate();
@@ -33,16 +36,22 @@ public class ManualChange {
        return manualChange;
    }

+
    public boolean isProcessed() {
+
        return processedDate != null;
    }

+
    public ManualChange withManualRedactionType(ManualRedactionType manualRedactionType) {
+
        this.manualRedactionType = manualRedactionType;
        return this;
    }

+
    public ManualChange withChange(String property, String value) {
+
        this.propertyChanges.put(property, value);
        return this;
    }
@@ -2,6 +2,9 @@ package com.iqser.red.service.redaction.v1.model;

 public enum MessageType {

-    ANALYSE, REANALYSE, STRUCTURE_ANALYSE, SURROUNDING_TEXT
+    ANALYSE,
+    REANALYSE,
+    STRUCTURE_ANALYSE,
+    SURROUNDING_TEXT

 }
@@ -12,4 +12,5 @@ import lombok.NoArgsConstructor;
 public class ReanalyzeResult {

    private RedactionLog redactionLog;
+
 }
@@ -14,4 +14,5 @@ public class Rectangle {
    private float height;

    private int page;
+
 }
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -8,14 +9,12 @@ import lombok.NoArgsConstructor;
 import java.util.ArrayList;
 import java.util.List;

-
@Data
@CompiledJson
@AllArgsConstructor
@NoArgsConstructor
 public class RedactionLog {

-
    /**
     * Version 0 Redaction Logs have manual redactions merged inside them
     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
@@ -35,5 +34,4 @@ public class RedactionLog {
    private long rulesVersion = -1;
    private long legalBasisVersion = -1;

-
 }
@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;

 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.*;

 import java.util.*;

-
@Data
@Builder
@NoArgsConstructor
@@ -35,7 +35,6 @@ public class RedactionLogEntry {
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;

-
    private String textBefore;
    private String textAfter;

@@ -70,21 +69,27 @@ public class RedactionLogEntry {
    @Builder.Default
    private Set<String> importedRedactionIntersections = new HashSet<>();

+
    public boolean lastChangeIsRemoved() {
+
        return last(changes).map(c -> c.getType() == ChangeType.REMOVED).orElse(false);
    }

+
    public boolean isLocalManualRedaction() {
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY &&
-                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
    }

+
    public boolean isManuallyRemoved() {
-        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY &&
-                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY && mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
    }

+
    private <T> Optional<T> last(List<T> list) {
+
        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(list.size() - 1));
    }

@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.model;
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -29,4 +30,5 @@ public class RedactionRequest {
    private List<Type> types;

    private boolean includeFalsePositives;
+
 }
@@ -15,13 +15,20 @@ public class SectionArea {
    private int page;
    private String header;

+
    public boolean contains(Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
+
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft()
+                .getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft()
+                .getY() + other.getHeight();
    }

+
    // TODO we should only use one rectangle class.
    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
-        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
+
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft()
+                .getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
    }

 }
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,4 +29,5 @@ public class SectionGrid {
        private List<SectionArea> sectionAreas;

    }
+
 }
@@ -4,6 +4,7 @@ import com.iqser.red.service.persistence.service.v1.api.model.annotations.Manual
 import com.iqser.red.service.redaction.v1.model.RedactionLog;
 import com.iqser.red.service.redaction.v1.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,8 +33,6 @@ public interface RedactionResource {


    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
-                                        @PathVariable("fileId") String fileId,
-                                        @RequestBody ManualRedactions manualRedactions);
+    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId, @PathVariable("fileId") String fileId, @RequestBody ManualRedactions manualRedactions);

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

@@ -12,8 +12,8 @@
    <artifactId>redaction-service-server-v1</artifactId>

    <properties>
-        <drools.version>7.68.0.Final</drools.version>
-        <kie.version>7.68.0.Final</kie.version>
+        <drools.version>7.73.0.Final</drools.version>
+        <kie.version>7.73.0.Final</kie.version>
        <locationtech.version>1.18.2</locationtech.version>
        <javaassist.version>3.28.0-GA</javaassist.version>
        <ahocorasick.version>0.6.3</ahocorasick.version>
@@ -30,6 +30,7 @@
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>storage-commons</artifactId>
+            <version>1.8.5</version>
        </dependency>

        <dependency>
@@ -38,6 +39,12 @@
            <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>
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server;
 import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -22,14 +23,16 @@ import io.micrometer.core.instrument.MeterRegistry;
 public class Application {

    public static void main(String[] args) {
+
        System.setProperty("org.apache.pdfbox.rendering.UsePureJavaCMYKConversion", "true");
        SpringApplication.run(Application.class, args);
    }

+
    @Bean
    public TimedAspect timedAspect(MeterRegistry registry) {
+
        return new TimedAspect(registry);
    }

-
 }
@@ -14,7 +14,9 @@ public class FloatFrequencyCounter {
    @Getter
    Map<Float, Integer> countPerValue = new HashMap<>();

+
    public void add(float value) {
+
        if (!countPerValue.containsKey(value)) {
            countPerValue.put(value, 1);
        } else {
@@ -22,7 +24,9 @@ public class FloatFrequencyCounter {
        }
    }

+
    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());
@@ -32,12 +36,12 @@ public class FloatFrequencyCounter {
        }
    }

+
    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()) {
+            if (mostPopular == null || entry.getValue() >= mostPopular.getValue()) {
                mostPopular = entry;
            }
        }
@@ -46,6 +50,7 @@ public class FloatFrequencyCounter {


    public List<Float> getHighterThanMostPopular() {
+
        Float mostPopular = getMostPopular();
        List<Float> higher = new ArrayList<>();
        for (Float value : countPerValue.keySet()) {
@@ -59,11 +64,10 @@ public class FloatFrequencyCounter {


    public Float getHighest() {
+
        Float highest = null;
        for (Float value : countPerValue.keySet()) {
-            if (highest == null) {
-                highest = value;
-            } else if (value > highest) {
+            if (highest == null || value > highest) {
                highest = value;
            }
        }
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -14,6 +15,7 @@ public class Footer {

    private List<TextBlock> textBlocks;

+
    @JsonIgnore
    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -14,6 +15,7 @@ public class Header {

    private List<TextBlock> textBlocks;

+
    @JsonIgnore
    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {
@@ -2,5 +2,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;

 public enum Orientation {

-    NONE, LEFT, RIGHT
+    NONE,
+    LEFT,
+    RIGHT
 }
@@ -1,15 +1,18 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
-import lombok.Data;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;

+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
@Data
@RequiredArgsConstructor
 public class Page {
@@ -31,7 +34,8 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

-    private double cropBoxArea;
+    private float pageWidth;
+    private float pageHeight;


    public boolean isRotated() {
@@ -4,6 +4,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;

@@ -7,6 +7,7 @@ import com.iqser.red.service.redaction.v1.model.SectionArea;
 import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,19 +28,25 @@ public class SectionText {
    private boolean isTable;
    private String headline;

+    @Builder.Default
    private List<SectionArea> sectionAreas = new ArrayList<>();
+    @Builder.Default
    private Set<Image> images = new HashSet<>();
-
+    @Builder.Default
    private List<TextBlock> textBlocks = new ArrayList<>();
+    @Builder.Default
    private Map<String, CellValue> tabularData = new HashMap<>();
+    @Builder.Default
    private List<Integer> cellStarts = new ArrayList<>();


    public void setTabularData(Map<String, CellValue> tabularData) {
+
        tabularData.remove(null);
        this.tabularData = tabularData;
    }

+
    @JsonIgnore
    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedSectionText {
+
+    private int sectionNumber;
+    private String text;
+
+}
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.dslplatform.json.CompiledJson;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@CompiledJson
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimplifiedText {
+
+    private int numberOfPages;
+    private List<SimplifiedSectionText> sectionTexts = new ArrayList<>();
+
+}
@@ -37,9 +37,7 @@ 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;
            }
        }
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -1,19 +1,21 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

+import java.util.ArrayList;
+import java.util.List;
+
 import com.dslplatform.json.CompiledJson;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextDirection;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.List;
-
@AllArgsConstructor
@Builder
@Data
@@ -23,20 +25,167 @@ public class TextBlock extends AbstractTextContainer {

    @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 String classification;


+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    public TextDirection getDir() {
+
+        return sequences.get(0).getDir();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    private float getPageHeight() {
+
+        return sequences.get(0).getPageHeight();
+    }
+
+
+    @JsonIgnore
+    @JsonAttribute(ignore = true)
+    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
+    @JsonAttribute(ignore = true)
+    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
+    @JsonAttribute(ignore = true)
+    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
+    @JsonAttribute(ignore = true)
+    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
+    @JsonAttribute(ignore = true)
+    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 TextBlock(float minX, float maxX, float minY, float maxY, List<TextPositionSequence> sequences, int rotation) {
+
        this.minX = minX;
        this.maxX = maxX;
        this.minY = minY;
@@ -45,19 +194,25 @@ public class TextBlock extends AbstractTextContainer {
        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();
        }
@@ -73,30 +228,38 @@ public class TextBlock extends AbstractTextContainer {
        sequences.addAll(r.getSequences());
    }

+
    public void add(TextPositionSequence r) {
-        if (r.getX1() < minX) {
-            minX = r.getX1();
+
+        if (r.getMinXDirAdj() < minX) {
+            minX = r.getMinXDirAdj();
        }
-        if (r.getX2() > maxX) {
-            maxX = r.getX2();
+        if (r.getMaxXDirAdj() > maxX) {
+            maxX = r.getMaxXDirAdj();
        }
-        if (r.getY1() < minY) {
-            minY = r.getY1();
+        if (r.getMinYDirAdj() < minY) {
+            minY = r.getMinYDirAdj();
        }
-        if (r.getY2() > maxY) {
-            maxY = r.getY2();
+        if (r.getMaxYDirAdj() > maxY) {
+            maxY = r.getMaxYDirAdj();
        }
    }

+
    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);
@@ -122,6 +285,7 @@ public class TextBlock extends AbstractTextContainer {

    }

+
    @Override
    @JsonIgnore
    @JsonAttribute(ignore = true)
@@ -132,7 +296,7 @@ public class TextBlock extends AbstractTextContainer {
        TextPositionSequence previous = null;
        for (TextPositionSequence word : sequences) {
            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(' ');
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import com.dslplatform.json.JsonAttribute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -14,6 +15,7 @@ public class UnclassifiedText {

    private List<TextBlock> textBlocks;

+
    @JsonIgnore
    @JsonAttribute(ignore = true)
    public SearchableText getSearchableText() {
@@ -2,25 +2,22 @@ package com.iqser.red.service.redaction.v1.server.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.classification.model.FloatFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.StringFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
+import com.iqser.red.service.redaction.v1.server.classification.utils.RulingTextDirAdjustUtil;
 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;
-
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;

@Service
@SuppressWarnings("all")
@@ -29,10 +26,16 @@ public class BlockificationService {
    static final float THRESHOLD = 1f;


-    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
-                         List<Ruling> verticalRulingLines) {
-
-        sortRotatedSequences(textPositions);
+    /**
+     * This method is building blocks by expanding the minX/maxX and minY/maxY value on each word that is not split by the conditions.
+     * This method must use text direction adjusted postions (DirAdj). Where {0,0} is on the upper left. Never try to change this!
+     * Rulings (Table lines) must be adjusted to the text directions as well, when checking if a block is split by a ruling.
+     * @param textPositions The words of a page.
+     * @param horizontalRulingLines Horizontal table lines.
+     * @param verticalRulingLines Vertical table lines.
+     * @return Page object that contains the Textblock and text statistics.
+     */
+    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {

        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();
@@ -44,16 +47,15 @@ public class BlockificationService {
        Float splitX1 = null;
        for (TextPositionSequence word : textPositions) {

-            boolean lineSeparation = minY - word.getY2() > word.getHeight() * 1.25;
-            boolean startFromTop = word.getY1() > maxY + word.getHeight();
-            boolean splitByX = prev != null && maxX + 50 < word.getX1() && prev.getY1() == word.getY1();
-            boolean newLineAfterSplit = prev != null && word.getY1() != prev.getY1() && wasSplitted && splitX1 != word.getX1();
-            boolean splittedByRuling = word.getRotation() == 0 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), verticalRulingLines) || word
-                    .getRotation() == 0 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), horizontalRulingLines) || word
-                    .getRotation() == 90 && isSplittedByRuling(maxX, minY, word.getX1(), word.getY1(), horizontalRulingLines) || word
-                    .getRotation() == 90 && isSplittedByRuling(minX, minY, word.getX1(), word.getY2(), verticalRulingLines);
+            boolean lineSeparation = word.getMinYDirAdj() - maxY > word.getHeight() * 1.25;
+            boolean startFromTop = prev != null && word.getMinYDirAdj() < prev.getMinYDirAdj() - prev.getTextHeight();
+            boolean splitByX = prev != null && maxX + 50 < word.getMinXDirAdj() && prev.getMinYDirAdj() == word.getMinYDirAdj();
+            boolean xIsBeforeFirstX = prev != null && word.getMinXDirAdj() < minX;
+            boolean newLineAfterSplit = prev != null && word.getMinYDirAdj() != prev.getMinYDirAdj() && wasSplitted && splitX1 != word.getMinXDirAdj();
+            boolean isSplitByRuling = isSplitByRuling(minX, minY, maxX, maxY, word, horizontalRulingLines, verticalRulingLines);
+            boolean splitByDir = prev != null && !prev.getDir().equals(word.getDir());

-            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {
+            if (prev != null && (lineSeparation || startFromTop || splitByX || splitByDir || isSplitByRuling)) {

                Orientation prevOrientation = null;
                if (!chunkBlockList1.isEmpty()) {
@@ -64,15 +66,15 @@ public class BlockificationService {
                chunkBlockList1.add(cb1);
                chunkWords = new ArrayList<>();

-                if (splitByX && !splittedByRuling) {
+                if (splitByX && !isSplitByRuling) {
                    wasSplitted = true;
                    cb1.setOrientation(Orientation.LEFT);
-                    splitX1 = word.getX1();
-                } else if (newLineAfterSplit && !splittedByRuling) {
+                    splitX1 = word.getMinXDirAdj();
+                } else if (newLineAfterSplit && !isSplitByRuling) {
                    wasSplitted = false;
                    cb1.setOrientation(Orientation.RIGHT);
                    splitX1 = null;
-                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)) {
+                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !isSplitByRuling)) {
                    cb1.setOrientation(Orientation.LEFT);
                }

@@ -86,17 +88,17 @@ public class BlockificationService {
            chunkWords.add(word);

            prev = word;
-            if (word.getX1() < minX) {
-                minX = word.getX1();
+            if (word.getMinXDirAdj() < minX) {
+                minX = word.getMinXDirAdj();
            }
-            if (word.getX2() > maxX) {
-                maxX = word.getX2();
+            if (word.getMaxXDirAdj() > maxX) {
+                maxX = word.getMaxXDirAdj();
            }
-            if (word.getY1() < minY) {
-                minY = word.getY1();
+            if (word.getMinYDirAdj() < minY) {
+                minY = word.getMinYDirAdj();
            }
-            if (word.getY2() > maxY) {
-                maxY = word.getY2();
+            if (word.getMaxYDirAdj() > maxY) {
+                maxY = word.getMaxYDirAdj();
            }
        }

@@ -113,8 +115,7 @@ public class BlockificationService {
            TextBlock block = (TextBlock) itty.next();

            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
-                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft
-                        .getMinY()) {
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()) {
                    previousLeft.add(block);
                    itty.remove();
                    continue;
@@ -122,8 +123,7 @@ public class BlockificationService {
            }

            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
-                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight
-                        .getMinY()) {
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()) {
                    previousRight.add(block);
                    itty.remove();
                    continue;
@@ -142,10 +142,8 @@ public class BlockificationService {
        while (itty.hasNext()) {
            TextBlock block = (TextBlock) itty.next();

-            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
-                    .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous
-                    .getOrientation()
-                    .equals(Orientation.LEFT) && block.getOrientation()
+            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(),
+                    previous.getMaxY()) || previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
                previous.add(block);
                itty.remove();
@@ -184,12 +182,10 @@ public class BlockificationService {
            styleFrequencyCounter.add(wordBlock.getFontStyle());

            if (textBlock == null) {
-                textBlock = new TextBlock(wordBlock.getX1(), wordBlock.getX2(), wordBlock.getY1(), wordBlock.getY2(), wordBlockList, wordBlock
-                        .getRotation());
+                textBlock = new TextBlock(wordBlock.getMinXDirAdj(), wordBlock.getMaxXDirAdj(), wordBlock.getMinYDirAdj(), wordBlock.getMaxYDirAdj(), wordBlockList, wordBlock.getRotation());
            } else {
                TextBlock spatialEntity = textBlock.union(wordBlock);
-                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity
-                        .getHeight());
+                textBlock.resize(spatialEntity.getMinX(), spatialEntity.getMinY(), spatialEntity.getWidth(), spatialEntity.getHeight());
            }
        }

@@ -202,22 +198,33 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

-        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences()
-                .stream()
-                .map(t -> round(t.getY1(), 3))
-                .collect(toSet())
-                .size() == 1) {
-            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1));
+        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences().stream().map(t -> round(t.getMinYDirAdj(), 3)).collect(toSet()).size() == 1) {
+            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getMinXDirAdj));
        }
        return textBlock;
    }


-    private boolean isSplittedByRuling(float previousX2, float previousY1, float currentX1, float currentY1,
-                                       List<Ruling> rulingLines) {
+    private boolean isSplitByRuling(float minX,
+                                    float minY,
+                                    float maxX,
+                                    float maxY,
+                                    TextPositionSequence word,
+                                    List<Ruling> horizontalRulingLines,
+                                    List<Ruling> verticalRulingLines) {
+
+        return isSplitByRuling(maxX, minY, word.getMinXDirAdj(), word.getMinYDirAdj(), verticalRulingLines, word.getDir().getDegrees(), word.getPageWidth(), word.getPageHeight()) //
+                || isSplitByRuling(minX, minY, word.getMinXDirAdj(), word.getMaxYDirAdj(), horizontalRulingLines, word.getDir().getDegrees(), word.getPageWidth(), word.getPageHeight()) //
+                || isSplitByRuling(maxX, minY, word.getMinXDirAdj(), word.getMinYDirAdj(), horizontalRulingLines, word.getDir().getDegrees(), word.getPageWidth(), word.getPageHeight()) //
+                || isSplitByRuling(minX, minY, word.getMinXDirAdj(), word.getMaxYDirAdj(), verticalRulingLines, word.getDir().getDegrees(), word.getPageWidth(), word.getPageHeight()); //
+    }
+
+
+    private boolean isSplitByRuling(float previousX2, float previousY1, float currentX1, float currentY1, List<Ruling> rulingLines, float dir, float pageWidth, float pageHeight) {

        for (Ruling ruling : rulingLines) {
-            if (ruling.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
+            var line = RulingTextDirAdjustUtil.convertToDirAdj(ruling, dir, pageWidth, pageHeight);
+            if (line.intersectsLine(previousX2, previousY1, currentX1, currentY1)) {
                return true;
            }
        }
@@ -225,104 +232,6 @@ public class BlockificationService {
    }


-    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);
-    }
-
-
-    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
-
-        List<TextPositionSequence> rotatedWords = new ArrayList<>();
-        Iterator<TextPositionSequence> itty = sequences.iterator();
-        while (itty.hasNext()) {
-            var pos = itty.next();
-            if (pos.getTextPositions().get(0).getDir() == 270) {
-                rotatedWords.add(pos);
-                itty.remove();
-            }
-        }
-
-        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
-            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
-        }
-        sequences.addAll(rotatedWords);
-    }
-
-
    private double round(float value, int decimalPoints) {

        var d = Math.pow(10, decimalPoints);
@@ -0,0 +1,161 @@
+package com.iqser.red.service.redaction.v1.server.classification.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.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.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.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+
+@Service
+public class BodyTextFrameService {
+
+    /**
+     * 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(Page 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<Page> pages, FloatFrequencyCounter documentFontSizeCounter, boolean landscape) {
+
+        BodyTextFrameExpansionsRectangle expansionsRectangle = new BodyTextFrameExpansionsRectangle();
+
+        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 && textBlock.getMostPopularWordFontSize() >= documentFontSizeCounter.getMostPopular()) {
+
+                        expandRectangle(textBlock, page, expansionsRectangle);
+                    }
+                }
+
+                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()) {
+                                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(TextBlock textBlock, Page 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;
+
+    }
+
+}
@@ -1,82 +1,82 @@
 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.model.Rectangle;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.regex.Pattern;

@Slf4j
@Service
@RequiredArgsConstructor
 public class ClassificationService {

-    private final BlockificationService blockificationService;
+    private final BodyTextFrameService bodyTextFrameService;


    public void classifyDocument(Document document) {

-        Rectangle bodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
-        Rectangle landscapeBodyTextFrame = blockificationService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), true);
-
+        Rectangle bodyTextFrame = bodyTextFrameService.calculateBodyTextFrame(document.getPages(), document.getFontSizeCounter(), false);
+        Rectangle landscapeBodyTextFrame = bodyTextFrameService.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);
+            bodyTextFrameService.setBodyTextFrameAdjustedToPage(page, bodyTextFrame, landscapeBodyTextFrame);
+            classifyPage(page, document, headlineFontSizes);
        }
    }


-    public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyPage(Page page, Document document, List<Float> headlineFontSizes) {

        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
            if (textBlock instanceof TextBlock) {
-                classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
+                classifyBlock((TextBlock) textBlock, page, document, headlineFontSizes);
            }
        }
    }


-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
-                              List<Float> headlineFontSizes) {
+    public void classifyBlock(TextBlock textBlock, Page page, Document document, List<Float> headlineFontSizes) {
+
+        var bodyTextFrame = page.getBodyTextFrame();

        if (document.getFontSizeCounter().getMostPopular() == null) {
            textBlock.setClassification("Other");
            return;
        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
-                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
-                .getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (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())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock, page.getRotation()) && (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)) {
+        } else if (page.getPageNumber() == 1 && (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") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
-                .getFontSizeCounter()
-                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
+        } else if (textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle().equals("bold") || !document.getFontStyleCounter()
+                .getCountPerValue()
+                .containsKey("bold") && textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter().getMostPopular() + 1) && textBlock.getSequences()
+                .get(0)
+                .getTextPositions()
+                .get(0)
+                .getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -84,28 +84,25 @@ public class ClassificationService {
                    document.setHeadlines(true);
                }
            }
-        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
-                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
-                .equals("bold") && !document.getFontStyleCounter()
+        } 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.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences()
+                .get(0)
+                .getTextPositions()
+                .get(0)
+                .getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            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")) {
+        } 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()) {
+                .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()
+        } 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");
@@ -1,28 +1,27 @@
 package com.iqser.red.service.redaction.v1.server.classification.utils;

+import com.iqser.red.service.redaction.v1.model.Rectangle;
 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 final class PositionUtils {

+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
    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()) {
+        if (textBlock.getPdfMinX() + threshold > btf.getTopLeft().getX() && textBlock.getPdfMaxX() - threshold < btf.getTopLeft()
+                .getX() + btf.getWidth() && textBlock.getPdfMinY() + threshold > btf.getTopLeft().getY() && textBlock.getPdfMaxY() - threshold < btf.getTopLeft()
+                .getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -31,16 +30,27 @@ public class PositionUtils {
    }


-    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, boolean rotated) {
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
+    public boolean isOverBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {

        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.
+        if (rotation == 90 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
            return true;
-        } else if (!rotated && textBlock.getMinY() > btf.getY() + btf.getHeight()) {
+        }
+
+        if (rotation == 180 && textBlock.getPdfMaxY() < btf.getTopLeft().getY()) {
+            return true;
+        }
+
+        if (rotation == 270 && textBlock.getPdfMinX() > btf.getTopLeft().getX() + btf.getWidth()) {
+            return true;
+        }
+
+        if (rotation == 0 && textBlock.getPdfMinY() > btf.getTopLeft().getY() + btf.getHeight()) {
            return true;
        } else {
            return false;
@@ -48,16 +58,27 @@ public class PositionUtils {

    }

-
-    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {
-
-        //TODO Currently this is not working for rotated pages.
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
+    public boolean isUnderBodyTextFrame(Rectangle btf, TextBlock textBlock, int rotation) {

        if (btf == null || textBlock == null) {
            return false;
        }

-        if (textBlock.getMaxY() < btf.getY()) {
+        if (rotation == 90 && textBlock.getPdfMinX() > btf.getTopLeft().getX() + btf.getWidth()) {
+            return true;
+        }
+
+        if (rotation == 180 && textBlock.getPdfMinY() > btf.getTopLeft().getY() + btf.getHeight()) {
+            return true;
+        }
+
+        if (rotation == 270 && textBlock.getPdfMaxX() < btf.getTopLeft().getX()) {
+            return true;
+        }
+
+        if (rotation == 0 && textBlock.getPdfMaxY() < btf.getTopLeft().getY()) {
            return true;
        } else {
            return false;
@@ -65,7 +86,8 @@ public class PositionUtils {

    }

-
+    // TODO This currently uses pdf coord system. In the futher this should use java coord system.
+    // Note: DirAdj (TextDirection Adjusted) can not be user for this.
    public boolean isTouchingUnderBodyTextFrame(Rectangle btf, TextBlock textBlock) {

        //TODO Currently this is not working for rotated pages.
@@ -74,7 +96,7 @@ public class PositionUtils {
            return false;
        }

-        if (textBlock.getMinY() < btf.getY()) {
+        if (textBlock.getMinY() < btf.getTopLeft().getY()) {
            return true;
        } else {
            return false;
@@ -84,11 +106,14 @@ public class PositionUtils {


    public float getHeightDifferenceBetweenChunkWordAndDocumentWord(TextBlock textBlock, Float documentMostPopularWordHeight) {
+
        return textBlock.getMostPopularWordHeight() - documentMostPopularWordHeight;
    }


    public Float getApproxLineCount(TextBlock textBlock) {
+
        return textBlock.getHeight() / textBlock.getMostPopularWordHeight();
    }
+
 }
@@ -0,0 +1,67 @@
+package com.iqser.red.service.redaction.v1.server.classification.utils;
+
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public final class RulingTextDirAdjustUtil {
+
+    /**
+     * Converts a ruling (line of a table) the same way TextPositions are converted in PDFBox.
+     * This will get the y position of the text, adjusted so that 0,0 is upper left and it is adjusted based on the text direction.
+     *
+     * See org.apache.pdfbox.text.TextPosition
+     */
+    public Line2D.Float convertToDirAdj(Ruling ruling, float dir, float pageWidth, float pageHeight) {
+
+        return new Line2D.Float(convertPoint(ruling.x1, ruling.y1, dir, pageWidth, pageHeight), convertPoint(ruling.x2, ruling.y2, dir, pageWidth, pageHeight));
+    }
+
+
+    private Point2D convertPoint(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        var xAdj = getXRot(x, y, dir, pageWidth, pageHeight);
+        var yAdj = 0f;
+        if (dir == 0 || dir == 180) {
+            yAdj = pageHeight - getYLowerLeftRot(x, y, dir, pageWidth, pageHeight);
+        } else {
+            yAdj = pageWidth - getYLowerLeftRot(x, y, dir, pageWidth, pageHeight);
+        }
+        return new Point2D.Float(xAdj, yAdj);
+    }
+
+
+    private float getXRot(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        if (dir == 0) {
+            return x;
+        } else if (dir == 90) {
+            return y;
+        } else if (dir == 180) {
+            return pageWidth - x;
+        } else if (dir == 270) {
+            return pageHeight - y;
+        }
+        return 0;
+    }
+
+
+    private float getYLowerLeftRot(float x, float y, float dir, float pageWidth, float pageHeight) {
+
+        if (dir == 0) {
+            return y;
+        } else if (dir == 90) {
+            return pageWidth - x;
+        } else if (dir == 180) {
+            return pageHeight - y;
+        } else if (dir == 270) {
+            return x;
+        }
+        return 0;
+    }
+
+}
@@ -6,4 +6,5 @@ import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryReso

@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
+
 }
@@ -1,10 +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.resources.FileStatusProcessingUpdateResource;

@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
+
 }
@@ -6,4 +6,5 @@ import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMapp

@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
 public interface LegalBasisClient extends LegalBasisMappingResource {
+
 }
@@ -1,16 +1,16 @@
 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;

-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class MockMultipartFile implements MultipartFile {

    private final String name;
@@ -32,8 +32,7 @@ public class MockMultipartFile implements MultipartFile {
    }


-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
-                             @Nullable byte[] content) {
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, @Nullable byte[] content) {

        Assert.hasLength(name, "Name must not be empty");
        this.name = name;
@@ -43,8 +42,7 @@ public class MockMultipartFile implements MultipartFile {
    }


-    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
-                             InputStream contentStream) throws IOException {
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType, InputStream contentStream) throws IOException {

        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
    }
@@ -82,13 +80,13 @@ public class MockMultipartFile implements MultipartFile {
    }


-    public byte[] getBytes() throws IOException {
+    public byte[] getBytes() {

        return this.content;
    }


-    public InputStream getInputStream() throws IOException {
+    public InputStream getInputStream() {

        return new ByteArrayInputStream(this.content);
    }
@@ -6,4 +6,5 @@ import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;

@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
+
 }
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.client.model;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,9 +14,9 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
 public class EntityRecogintionEntity {

-      private String value;
-      private int startOffset;
-      private int endOffset;
-      private String type;
+    private String value;
+    private int startOffset;
+    private int endOffset;
+    private String type;

 }
@@ -13,6 +13,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
 public class EntityRecognitionRequest {

-   private List<EntityRecognitionSection> data;
+    private List<EntityRecognitionSection> data;

 }
@@ -17,4 +17,5 @@ public class EntityRecognitionResult {

    @Builder.Default
    private Map<Integer, List<EntityRecogintionEntity>> entities = new HashMap<>();
+
 }
@@ -13,4 +13,5 @@ public class EntityRecognitionSection {

    private int sectionNumber;
    private String text;
+
 }
@@ -5,8 +5,8 @@ import java.util.List;
 import java.util.Map;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@@ -16,6 +16,6 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class NerEntities {

-   private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();
+    private Map<Integer, List<EntityRecogintionEntity>> data = new HashMap<>();

 }
@@ -3,7 +3,9 @@ package com.iqser.red.service.redaction.v1.server.controller;
 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;
@@ -18,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());
@@ -30,17 +34,21 @@ 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());
    }

@@ -1,29 +1,34 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.redaction.v1.model.*;
-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.NotFoundException;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.*;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.stream.Collectors;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+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.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.ManualRedactionSurroundingTextService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
@@ -37,14 +42,19 @@ public class RedactionController implements RedactionResource {
    private final RedactionLogMergeService redactionLogMergeService;
    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;

+
    @Override
    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
+                redactionRequest.getFileId(),
+                FileType.ORIGIN));
        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
+                    redactionRequest.getFileId(),
+                    FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                pdDocument.setAllSecurityToBeRemoved(true);

@@ -66,11 +76,15 @@ public class RedactionController implements RedactionResource {
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {

-        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
+                redactionRequest.getFileId(),
+                FileType.ORIGIN));
        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);

-            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
+            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
+                    redactionRequest.getFileId(),
+                    FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
                pdDocument.setAllSecurityToBeRemoved(true);

@@ -94,8 +108,10 @@ public class RedactionController implements RedactionResource {
        Document classifiedDoc;

        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(),
+                    redactionRequest.getFileId(),
+                    FileType.ORIGIN));
+            classifiedDoc = pdfSegmentationService.parseDocument(redactionRequest.getDossierId(), redactionRequest.getFileId(), storedObjectStream, null);
        } catch (Exception e) {
            throw new RedactionException(e);
        }
@@ -118,14 +134,17 @@ public class RedactionController implements RedactionResource {
    @Override
    public void testRules(@RequestBody String rules) {

-        droolsExecutionService.testRules(rules);
+        try {
+            droolsExecutionService.testRules(rules);
+        } catch (Exception e) {
+            throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
+        }
    }


    @Override
    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {

-
        return redactionLogMergeService.provideRedactionLog(redactionRequest);
    }

@@ -134,19 +153,14 @@ public class RedactionController implements RedactionResource {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
-            return RedactionResult.builder()
-                    .document(byteArrayOutputStream.toByteArray())
-                    .numberOfPages(numberOfPages)
-                    .build();
+            return RedactionResult.builder().document(byteArrayOutputStream.toByteArray()).numberOfPages(numberOfPages).build();
        }

    }


    @Override
-    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
-                                               @PathVariable("fileId") String fileId,
-                                               @RequestBody ManualRedactions manualRedactions) {
+    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId, @PathVariable("fileId") String fileId, @RequestBody ManualRedactions manualRedactions) {

        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
        log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());
@@ -1,10 +1,11 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-
 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.rulebuilder.RuleBuilderModelService;
+
 import lombok.RequiredArgsConstructor;
+
 import org.springframework.web.bind.annotation.RestController;

@RestController
@@ -13,8 +14,10 @@ public class RuleBuilderController implements RuleBuilderResource {

    private final RuleBuilderModelService ruleBuilderModelService;

+
    @Override
    public RuleBuilderModel getRuleBuilderModel() {
+
        return ruleBuilderModelService.getRuleBuilderModel();
    }

@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.exception;
 public class NotFoundException extends RuntimeException {

    public NotFoundException(String message) {
+
        super(message);
    }

@@ -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");
    }

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

@@ -69,17 +69,17 @@ import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;

 /**
 * 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
-{
+class LegacyPDFStreamEngine extends PDFStreamEngine {
+
    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);

    private int pageRotation;
@@ -88,11 +88,12 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
    private final GlyphList glyphList;
    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();

+
    /**
     * Constructor.
     */
-    LegacyPDFStreamEngine() throws IOException
-    {
+    LegacyPDFStreamEngine() throws IOException {
+
        addOperator(new BeginText());
        addOperator(new Concatenate());
        addOperator(new DrawObject()); // special text version
@@ -122,6 +123,7 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
    }

+
    /**
     * This will initialize and process the contents of the stream.
     *
@@ -129,33 +131,27 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
     * @throws java.io.IOException if there is an error accessing the stream.
     */
    @Override
-    public void processPage(PDPage page) throws IOException
-    {
+    public void processPage(PDPage page) throws IOException {
+
        this.pageRotation = page.getRotation();
        this.pageSize = page.getCropBox();

-        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0)
-        {
+        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0) {
            translateMatrix = null;
-        }
-        else
-        {
+        } 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
-    {
+    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code, String unicode, Vector displacement) throws IOException {
        //
        // legacy calculations which were previously in PDFStreamEngine
        //
@@ -173,25 +169,19 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
        // 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())
-        {
+        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 (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)
-            {
+            if (ttf != null && ttf.getUnitsPerEm() != 1000) {
                displacementX *= 1000f / ttf.getUnitsPerEm();
            }
        }
@@ -219,8 +209,7 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
        // (modified) width and height calculations
        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
        Float fontHeight = fontHeightMap.get(font.getCOSObject());
-        if (fontHeight == null)
-        {
+        if (fontHeight == null) {
            fontHeight = computeFontHeight(font);
            fontHeightMap.put(font.getCOSObject(), fontHeight);
        }
@@ -237,30 +226,24 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
        // saved).

        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
-        if (font instanceof PDType3Font)
-        {
+        if (font instanceof PDType3Font) {
            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
        }

        float spaceWidthText = 0;
-        try
-        {
+        try {
            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
-        }
-        catch (Throwable exception)
-        {
+        } catch (Throwable exception) {
            LOG.warn(exception, exception);
        }

-        if (spaceWidthText == 0)
-        {
+        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)
-        {
+        if (spaceWidthText == 0) {
            spaceWidthText = 1.0f; // if could not find font, use a generic value
        }

@@ -273,15 +256,11 @@ class LegacyPDFStreamEngine extends PDFStreamEngine
        // 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)
-            {
+        if (unicodeMapping == null) {
+            if (font instanceof PDSimpleFont) {
                char c = (char) code;
-                unicodeMapping = new String(new char[] { c });
-            }
-            else
-            {
+                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;
@@ -290,88 +269,118 @@ class LegacyPDFStreamEngine extends PDFStreamEngine

        // adjust for cropbox if needed
        Matrix translatedTextRenderingMatrix;
-        if (translateMatrix == null)
-        {
+        if (translateMatrix == null) {
            translatedTextRenderingMatrix = textRenderingMatrix;
-        }
-        else
-        {
+        } else {
            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
            nextX -= pageSize.getLowerLeftX();
            nextY -= pageSize.getLowerLeftY();
        }

-        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())));
+        // 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
-    {
+    protected float computeFontHeight(PDFont font) throws IOException {
+
        BoundingBox bbox = font.getBoundingBox();
-        if (bbox.getLowerLeftY() < Short.MIN_VALUE)
-        {
+        if (bbox.getLowerLeftY() < Short.MIN_VALUE) {
            // PDFBOX-2158 and PDFBOX-3130
            // files by Salmat eSolutions / ClibPDF Library
-            bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536));
+            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)
-        {
+        if (fontDescriptor != null) {
            float capHeight = fontDescriptor.getCapHeight();
-            if (Float.compare(capHeight, 0) != 0 &&
-                    (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0))
-            {
+            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))
-            {
+            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)
-        {
+        if (font instanceof PDType3Font) {
            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
-        }
-        else
-        {
+        } 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)
-    {
+    protected void processTextPosition(TextPosition text) {
        // subclasses can override to provide specific functionality
    }
+
 }
@@ -1,8 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
 import lombok.Getter;
 import lombok.Setter;
+
 import org.apache.pdfbox.text.PDFTextStripperByArea;
 import org.apache.pdfbox.text.TextPosition;

@@ -18,19 +20,19 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
    @Setter
    private int pageNumber;

+
    public PDFAreaTextStripper() throws IOException {

    }

+
    @Override
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
        for (int i = 0; i <= textPositions.size() - 1; i++) {

-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\u00A0"))) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0"))) {
                startIndex++;
                continue;
            }
@@ -38,32 +40,23 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-
            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i + 1;
@@ -71,14 +64,10 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {
        }

        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
-                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1).getUnicode().equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
-        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
-                .getUnicode()
-                .equals("\u00A0")))) {
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
        }
        super.writeString(text);
@@ -86,6 +75,7 @@ public class PDFAreaTextStripper extends PDFTextStripperByArea {


    public void clearPositions() {
+
        textPositionSequences = new ArrayList<>();
    }

@@ -3,9 +3,11 @@ package com.iqser.red.service.redaction.v1.server.parsing;
 import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
 import org.apache.pdfbox.contentstream.operator.color.*;
@@ -20,6 +22,7 @@ import org.apache.pdfbox.text.TextPosition;
 import java.awt.geom.Point2D;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;

@Slf4j
@@ -155,7 +158,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                graphicsPath.clear();
                break;

-
        }

        super.processOperator(operator, arguments);
@@ -182,14 +184,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {

        try {
            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
-                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor()
-                    .isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
+                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
                rulings.addAll(path);
            }
        } catch (UnsupportedOperationException e) {
-            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
-                    .getColorSpace()
-                    .getName() + " or " + getGraphicsState().getNonStrokingColor()
+            log.debug("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor()
                    .getColorSpace()
                    .getName() + " does not support toRGB");
        }
@@ -202,6 +201,8 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        int startIndex = 0;
        RedTextPosition previous = null;

+        textPositions.sort(Comparator.comparing(TextPosition::getXDirAdj));
+
        for (int i = 0; i <= textPositions.size() - 1; i++) {

            if (!textPositionSequences.isEmpty()) {
@@ -226,9 +227,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                maxCharHeight = charHeight;
            }

-            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i).getUnicode().equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
                startIndex++;
                continue;
            }
@@ -236,9 +235,7 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            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(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                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));
@@ -246,12 +243,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                startIndex = i;
            }

-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
-                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
-                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                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));
@@ -259,15 +253,11 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                startIndex = i;
            }

-            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
-                    .getUnicode()
-                    .equals("\u00A0") || textPositions.get(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)
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
                        .getUnicode()
                        .equals("\t")))) {

@@ -286,17 +276,15 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }

        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
-        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
-                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1)
+        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(" ") || sublist.get(0)
+        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
                .getUnicode()
-                .equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+                .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) {
@@ -21,16 +21,20 @@ import lombok.SneakyThrows;
 public class RedTextPosition {

    private String textMatrix;
+    private float[] position;
+
+    @JsonIgnore
    private int rotation;
-    private float y;
+
+    @JsonIgnore
    private float pageHeight;
+
+    @JsonIgnore
    private float pageWidth;
+
    private String unicode;
-    private float XDirAdj;
-    private float YDirAdj;
-    private float width;
-    private float heightDir;
-    private float widthDirAdj;
+
+    @JsonIgnore
    private float dir;

    // not used in reanalysis
@@ -51,6 +55,7 @@ public class RedTextPosition {

    @SneakyThrows
    public static RedTextPosition fromTextPosition(TextPosition textPosition) {
+
        var pos = new RedTextPosition();
        BeanUtils.copyProperties(textPosition, pos);
        pos.setFontName(textPosition.getFont().getName());
@@ -59,8 +64,43 @@ public class RedTextPosition {

        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];
+    }
+
 }
@@ -0,0 +1,70 @@
+package com.iqser.red.service.redaction.v1.server.parsing.model;
+
+import java.util.Objects;
+
+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;
+    }
+
+
+    @com.dslplatform.json.JsonValue
+    public float jsonValue() {
+
+        return getDegrees();
+    }
+
+
+    @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));
+    }
+
+
+    public static TextDirection fromString(String degreesAsString) {
+
+        Objects.requireNonNull(degreesAsString, "Cannot construct a text direction from a null value");
+
+        String value = degreesAsString.strip();
+
+        if (degreesAsString.endsWith(VALUE_STRING_SUFFIX)) {
+            value = degreesAsString.replace(VALUE_STRING_SUFFIX + "$", "");
+        }
+
+        return fromDegrees(Float.parseFloat(value));
+    }
+}
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -17,6 +19,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

@Slf4j
@@ -28,11 +31,14 @@ import lombok.extern.slf4j.Slf4j;
@JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {

+    public static final int HEIGHT_PADDING = 2;
    private int page;
    private List<RedTextPosition> textPositions = new ArrayList<>();

-    private float x1;
-    private float x2;
+    private TextDirection dir;
+    private int rotation;
+    private float pageHeight;
+    private float pageWidth;


    public TextPositionSequence(int page) {
@@ -41,20 +47,14 @@ public class TextPositionSequence implements CharSequence {
    }


-    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
-
-        var textPositionSequence = new TextPositionSequence();
-        textPositionSequence.textPositions = textPositions;
-        textPositionSequence.page = page;
-
-        return textPositionSequence;
-    }
-
-
    public TextPositionSequence(List<TextPosition> textPositions, int page) {

        this.textPositions = textPositions.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();
    }


@@ -85,7 +85,15 @@ public class TextPositionSequence implements CharSequence {
    @Override
    public TextPositionSequence subSequence(int start, int end) {

-        return fromData(textPositions.subList(start, end), page);
+        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;
    }


@@ -106,80 +114,86 @@ public class TextPositionSequence implements CharSequence {
    }


-    public void add(RedTextPosition textPosition) {
+    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
    @JsonAttribute(ignore = true)
-    public float getX1() {
-
-        if (textPositions.get(0).getRotation() == 90) {
-            return textPositions.get(0).getYDirAdj() - getTextHeight();
-        } else {
-            return textPositions.get(0).getXDirAdj();
-        }
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getX2() {
-
-        if (textPositions.get(0).getRotation() == 90) {
-            return textPositions.get(0).getYDirAdj();
-        } else {
-            return textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
-        }
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getRotationAdjustedY() {
-
-        return textPositions.get(0).getY();
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
-    public float getRotationAdjustedX() {
+    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
    @JsonAttribute(ignore = true)
-    public float getY1() {
+    public float getMaxXDirAdj() {
+
+        return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + HEIGHT_PADDING;

-        if (textPositions.get(0).getRotation() == 90) {
-            return textPositions.get(0).getXDirAdj();
-        } else {
-            return textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj();
-        }
    }


+    /**
+     * 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
    @JsonAttribute(ignore = true)
-    public float getY2() {
+    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
+    @JsonAttribute(ignore = true)
+    public float getMaxYDirAdj() {
+
+        return textPositions.get(0).getYDirAdj();

-        if (textPositions.get(0).getRotation() == 90) {
-            return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() - 2;
-        } else {
-            return textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() + getTextHeight();
-        }
    }


@@ -187,7 +201,7 @@ public class TextPositionSequence implements CharSequence {
    @JsonAttribute(ignore = true)
    public float getTextHeight() {

-        return textPositions.get(0).getHeightDir() + 2;
+        return textPositions.get(0).getHeightDir() + HEIGHT_PADDING;
    }


@@ -195,7 +209,7 @@ public class TextPositionSequence implements CharSequence {
    @JsonAttribute(ignore = true)
    public float getHeight() {

-        return getY2() - getY1();
+        return getMaxYDirAdj() - getMinYDirAdj();
    }


@@ -203,7 +217,7 @@ public class TextPositionSequence implements CharSequence {
    @JsonAttribute(ignore = true)
    public float getWidth() {

-        return getX2() - getX1();
+        return getMaxXDirAdj() - getMinXDirAdj();
    }


@@ -211,6 +225,9 @@ public class TextPositionSequence implements CharSequence {
    @JsonAttribute(ignore = true)
    public String getFont() {

+        if (textPositions.get(0).getFontName() == null) {
+            return "none";
+        }
        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
    }

@@ -219,6 +236,9 @@ public class TextPositionSequence implements CharSequence {
    @JsonAttribute(ignore = true)
    public String getFontStyle() {

+        if (textPositions.get(0).getFontName() == null) {
+            return "standard";
+        }
        String lowercaseFontName = textPositions.get(0).getFontName().toLowerCase();

        if (lowercaseFontName.contains("bold") && lowercaseFontName.contains("italic")) {
@@ -250,159 +270,53 @@ public class TextPositionSequence implements CharSequence {
    }


+    /**
+     * 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
    @JsonAttribute(ignore = true)
-    public int getRotation() {
-
-        return textPositions.get(0).getRotation();
-    }
-
-
-    @JsonIgnore
-    @JsonAttribute(ignore = true)
+    @SneakyThrows
    public Rectangle getRectangle() {

-        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, toString(), textPositions.get(0)
-                .getRotation(), textPositions.get(0).getDir());
+        log.debug("Page: '{}', Word: '{}', Rotation: '{}', textRotation {}", page, this, rotation, dir);

-        float height = getTextHeight();
+        float textHeight = getTextHeight();

-        float posXInit = getX1();
-        float posXEnd;
-        float posYInit;
-        float posYEnd;
+        RedTextPosition firstTextPos = textPositions.get(0);
+        RedTextPosition lastTextPos = textPositions.get(textPositions.size() - 1);

-        if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
-
-            posYInit = getX1();
-            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
-                    .getWidthDirAdj() - 3;
-            posXInit = textPositions.get(0).getYDirAdj() + 2;
-            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 180f) {
-
-            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
-            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0)
-                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
-            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
-            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
-
-        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
-
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
-                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
-
-        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
-
-            posXInit = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
-            posXEnd = textPositions.get(0).getXDirAdj();
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + 2;
-
-        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 90.0f) {
-            posXEnd = textPositions.get(0).getYDirAdj() + 2;
-            posYInit = getY1();
-            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-
-        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 180.0f) {
-
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() - 4;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getXDirAdj();
-            posYInit = textPositions.get(0).getYDirAdj() - 2 - textPositions.get(textPositions.size() - 1)
-                    .getHeightDir();
-            posYEnd = textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() - textPositions.get(textPositions.size() - 1).getHeightDir();
-
-        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 270.0f) {
-
-            posXInit = textPositions.get(0).getPageWidth() - getX1();
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posYInit = textPositions.get(0).getPageHeight() - getY1();
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() - height - 4;
-
-        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 0f) {
-
-            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + 2;
-
-        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 90f) {
-
-            posYInit = getX1();
-            posYEnd = getX2() - 3;
-            posXInit = textPositions.get(0).getYDirAdj() + 2;
-            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
-
-        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 180f) {
-
-            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
-            posXEnd = textPositions.get(0).getPageWidth() - getX2() + textPositions.get(0)
-                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
-            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
-            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
-
-        } else if (textPositions.get(0).getRotation() == 180 && textPositions.get(0).getDir() == 270.0f) {
-
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
-                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj();
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
-
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = posYInit + 1;
-            posXInit = textPositions.get(0).getXDirAdj();
-            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 90.0f) {
-
-            posYInit = getX1();
-            posYEnd = getX2() - height;
-            posXInit = textPositions.get(0).getYDirAdj() + 2;
-            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 180.0f) {
-
-            posXInit = textPositions.get(0).getPageWidth() - getX1() + 1;
-            posXEnd = textPositions.get(0).getPageWidth() - getX2() - 4;
-            posYInit = textPositions.get(0).getYDirAdj() - height + 2;
-            posYEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height + 2;
-
-        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
-
-            posYInit = textPositions.get(0).getPageHeight() - getX1();
-            posYEnd = textPositions.get(0).getPageHeight() - getX2() - height;
-            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
-            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + height;
+        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 {
-            // page rotation = 0 and text direction = 0
-            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
-            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
-            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
-                    .getYDirAdj() + 2;
+            transform.rotate(dir.getRadians(), pageHeight / 2f, pageHeight / 2f);
+            transform.translate(0f, pageWidth + textHeight);
+            transform.scale(1., -1.);
        }

-        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
-        log.debug("Rectangle: {}", rectangle);
-        return rectangle;
+        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);
    }

 }
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.queue;

 import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;

+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;

@@ -16,10 +17,12 @@ public class MessageReceiver {

    private final RedactionMessageReceiver redactionMessageReceiver;

+
    @RabbitHandler
    @RabbitListener(queues = REDACTION_QUEUE)
-    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
-        redactionMessageReceiver.receiveAnalyzeRequest(in, false);
+    public void receiveAnalyzeRequest(Message message) {
+
+        redactionMessageReceiver.receiveAnalyzeRequest(message, false);
    }

 }
@@ -17,16 +17,19 @@ public class MessagingConfiguration {

    public static final String REDACTION_PRIORITY_QUEUE = "redactionPriorityQueue";

+
    @Bean
    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false")
-    public MessageReceiver messageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+    public MessageReceiver messageReceiver(RedactionMessageReceiver redactionMessageReceiver) {
+
        return new MessageReceiver(redactionMessageReceiver);
    }


    @Bean
    @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "true")
-    public PriorityMessageReceiver priorityMessageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+    public PriorityMessageReceiver priorityMessageReceiver(RedactionMessageReceiver redactionMessageReceiver) {
+
        return new PriorityMessageReceiver(redactionMessageReceiver);
    }

@@ -34,11 +37,7 @@ public class MessagingConfiguration {
    @Bean
    public Queue redactionQueue() {

-        return QueueBuilder.durable(REDACTION_QUEUE)
-                .withArgument("x-dead-letter-exchange", "")
-                .withArgument("x-dead-letter-routing-key", REDACTION_DQL)
-                .maxPriority(2)
-                .build();
+        return QueueBuilder.durable(REDACTION_QUEUE).withArgument("x-dead-letter-exchange", "").withArgument("x-dead-letter-routing-key", REDACTION_DQL).maxPriority(2).build();
    }


@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.queue;

 import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_PRIORITY_QUEUE;

+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;

@@ -19,9 +20,9 @@ public class PriorityMessageReceiver {

    @RabbitHandler
    @RabbitListener(queues = REDACTION_PRIORITY_QUEUE)
-    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {
+    public void receiveAnalyzeRequest(Message message) {

-        redactionMessageReceiver.receiveAnalyzeRequest(in, true);
+        redactionMessageReceiver.receiveAnalyzeRequest(message, true);
    }

 }
@@ -1,5 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.queue;

+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+
+import org.springframework.amqp.AmqpRejectAndDontRequeueException;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
@@ -8,13 +16,10 @@ import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
 import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;

-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@@ -27,11 +32,27 @@ public class RedactionMessageReceiver {
    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;


-    public void receiveAnalyzeRequest(String in, boolean priority) throws JsonProcessingException {
+    @SneakyThrows
+    public void receiveAnalyzeRequest(Message message, boolean priority) {
+
+        var analyzeRequest = objectMapper.readValue(message.getBody(), AnalyzeRequest.class);
+
+        // This prevents from endless retries oom errors.
+        if (message.getMessageProperties().isRedelivered()) {
+            throw new AmqpRejectAndDontRequeueException(String.format("Error during last processing of request with dossierId: %s and fileId: %s, do not retry.",
+                    analyzeRequest.getDossierId(),
+                    analyzeRequest.getFileId()));
+        }
+
+        receiveAnalyzeRequest(analyzeRequest, priority);
+    }
+
+
+    @SneakyThrows
+    public void receiveAnalyzeRequest(AnalyzeRequest analyzeRequest, boolean priority) {

-        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
        log.info("Processing priority: {} analyze request for file: {}", priority, analyzeRequest.getFileId());
-        AnalyzeResult result = null;
+        AnalyzeResult result;

        try {
            switch (analyzeRequest.getMessageType()) {
@@ -52,9 +73,17 @@ public class RedactionMessageReceiver {
                    break;

                case SURROUNDING_TEXT:
-                    result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
-                    log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                    result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(),
+                            analyzeRequest.getFileId(),
+                            analyzeRequest.getManualRedactions());
+                    log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}",
+                            analyzeRequest.getDossierId(),
+                            analyzeRequest.getFileId(),
+                            result.getDuration());
                    break;
+
+                default:
+                    throw new IllegalArgumentException("Unknown MessageType: " + analyzeRequest.getMessageType());
            }

            result.setMessageType(analyzeRequest.getMessageType());
@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;
 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -20,6 +21,7 @@ public class CellValue {

    private int rowSpanStart;

+
    @Override
    public String toString() {

@@ -31,7 +33,7 @@ public class CellValue {
            TextPositionSequence previous = null;
            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(' ');
@@ -45,9 +47,7 @@ public class CellValue {
            }
        }

-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
-                .replaceAll("\n", " ")
-                .replaceAll(" {2}", " ");
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
    }

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

+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import lombok.Data;
 import lombok.Getter;

@@ -49,8 +50,9 @@ public class Dictionary {


    public DictionaryModel getType(String type) {
-
-        return localAccessMap.get(type);
+        DictionaryModel model = localAccessMap.get(type);
+        if (model == null) throw new NotFoundException("Type: " + type + " is not found");
+        return model;
    }


@@ -1,8 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.SearchImplementation;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -11,7 +11,6 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;

-
@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {
@@ -33,6 +32,7 @@ public class DictionaryModel implements Serializable {

    private final Set<String> localEntries = new HashSet<>();

+
    public DictionaryModel(String type,
                           int rank,
                           float[] color,
@@ -42,6 +42,7 @@ public class DictionaryModel implements Serializable {
                           Set<DictionaryEntry> falsePositives,
                           Set<DictionaryEntry> falseRecommendations,
                           boolean isDossierDictionary) {
+
        this.type = type;
        this.rank = rank;
        this.color = color;
@@ -53,39 +54,58 @@ public class DictionaryModel implements Serializable {
        this.falsePositives = falsePositives;
        this.falseRecommendations = falseRecommendations;

-        this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
-        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
-        this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+        this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
+                caseInsensitive);
+        this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
+                caseInsensitive);
+        this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream()
+                .filter(e -> !e.isDeleted())
+                .map(DictionaryEntry::getValue)
+                .collect(Collectors.toList()), caseInsensitive);

    }

+
    public SearchImplementation getLocalSearch() {
+
        if (this.localSearch == null) {
            this.localSearch = new SearchImplementation(this.localEntries, caseInsensitive);
        }
        return this.localSearch;
    }

+
    public SearchImplementation getEntriesSearch() {
+
        if (entriesSearch == null) {
-            this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+            this.entriesSearch = new SearchImplementation(this.entries.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()),
+                    caseInsensitive);
        }
        return entriesSearch;
    }

+
    public SearchImplementation getFalsePositiveSearch() {
+
        if (falsePositiveSearch == null) {
-            this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+            this.falsePositiveSearch = new SearchImplementation(this.falsePositives.stream()
+                    .filter(e -> !e.isDeleted())
+                    .map(DictionaryEntry::getValue)
+                    .collect(Collectors.toList()), caseInsensitive);
        }
        return falsePositiveSearch;
    }

+
    public SearchImplementation getFalseRecommendationsSearch() {
+
        if (falseRecommendationsSearch == null) {
-            this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream().filter(e -> !e.isDeleted()).map(DictionaryEntry::getValue).collect(Collectors.toList()), caseInsensitive);
+            this.falseRecommendationsSearch = new SearchImplementation(this.falseRecommendations.stream()
+                    .filter(e -> !e.isDeleted())
+                    .map(DictionaryEntry::getValue)
+                    .collect(Collectors.toList()), caseInsensitive);
        }
        return falseRecommendationsSearch;
    }

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

-
 }
@@ -13,4 +13,5 @@ public class DictionaryVersion {

    long dossierTemplateVersion;
    long dossierVersion;
+
 }
@@ -1,19 +1,15 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.*;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import com.iqser.red.service.redaction.v1.model.Engine;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
@Data
@Builder
@NoArgsConstructor
@@ -24,6 +20,7 @@ public class Entity implements ReasonHolder {
    private String word;
    private String type;
    private boolean redaction;
+    private boolean falsePositive;
    private String redactionReason;
    private String legalBasis;
    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
@@ -58,11 +55,27 @@ public class Entity implements ReasonHolder {

    private boolean resized;

+    private boolean skipRemoveEntitiesContainedInLarger;

-    public Entity(String word, String type, boolean redaction, String redactionReason,
-                  List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,
-                  String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start,
-                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references, EntityType entityType) {
+
+    public Entity(String word,
+                  String type,
+                  boolean redaction,
+                  String redactionReason,
+                  List<EntityPositionSequence> positionSequences,
+                  String headline,
+                  int matchedRule,
+                  int sectionNumber,
+                  String legalBasis,
+                  boolean isDictionaryEntry,
+                  String textBefore,
+                  String textAfter,
+                  Integer start,
+                  Integer end,
+                  boolean isDossierDictionaryEntry,
+                  Set<Engine> engines,
+                  Set<Entity> references,
+                  EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -85,8 +98,16 @@ public class Entity implements ReasonHolder {
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
-                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine, EntityType entityType) {
+    public Entity(String word,
+                  String type,
+                  Integer start,
+                  Integer end,
+                  String headline,
+                  int sectionNumber,
+                  boolean isDictionaryEntry,
+                  boolean isDossierDictionaryEntry,
+                  Engine engine,
+                  EntityType entityType) {

        this.word = word;
        this.type = type;
@@ -100,5 +121,4 @@ public class Entity implements ReasonHolder {
        this.entityType = entityType;
    }

-
 }
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

 public enum EntityType {
-    ENTITY, RECOMMENDATION, FALSE_POSITIVE, FALSE_RECOMMENDATION
+    ENTITY,
+    RECOMMENDATION,
+    FALSE_POSITIVE,
+    FALSE_RECOMMENDATION
 }
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FindEntitiesResult {
+
+    private Set<Entity> entities;
+    private Set<FileAttribute> addedFileAttributes;
+}
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -1,5 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

 public enum ImageType {
-    LOGO, FORMULA, SIGNATURE, OTHER, OCR
+    LOGO,
+    FORMULA,
+    SIGNATURE,
+    OTHER,
+    OCR
 }
@@ -0,0 +1,27 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class OffsetString {
+
+    private String value;
+    private int start;
+    private int end;
+
+
+    public OffsetString trim() {
+
+        String trimmed = this.value.trim();
+        int indexInUntrimmed = this.value.indexOf(trimmed);
+
+        int newStart = this.start + indexInUntrimmed;
+        int newEnd = newStart + trimmed.length();
+
+        return new OffsetString(trimmed, newStart, newEnd);
+    }
+
+}
+
@@ -1,10 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

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

+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -19,5 +22,7 @@ public class PageEntities {
    @Builder.Default
    private Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();

+    @Builder.Default
+    private Set<FileAttribute> addedFileAttributes = new HashSet<>();

 }
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+public class PdfTable {
+
+    @NonNull
+    private List<PdfTableCell> tableCells = new ArrayList<>();
+
+}
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+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;
+
+}
@@ -4,11 +4,13 @@ public interface ReasonHolder {

    String getRedactionReason();

+
    void setRedactionReason(String reason);

+
    boolean isRedaction();

+
    void setRedaction(boolean value);

-
 }
@@ -23,26 +23,30 @@ public class RedRectangle2D {
    private double width;
    private double height;

+
    @JsonIgnore
    @JsonAttribute(ignore = true)
    public boolean isEmpty() {
+
        return width <= 0.0f || height <= 0.0f;
    }

+
    public boolean contains(double x, double y, double w, double h) {
+
        if (isEmpty() || w <= 0 || h <= 0) {
            return false;
        }
        double x0 = getX();
        double y0 = getY();
-        return round(x) >= round(x0) &&
-                round(y) >= round(y0) &&
-                (x + w) - (x0 + getWidth()) <= THRESHOLD &&
-                (y + h) - (y0 + getHeight()) <= THRESHOLD;
+        return round(x) >= round(x0) && round(y) >= round(y0) && (x + w) - (x0 + getWidth()) <= THRESHOLD && (y + h) - (y0 + getHeight()) <= THRESHOLD;
    }

+
    private double round(double value) {
+
        double d = Math.pow(10, 2);
        return Math.round(value * d) / d;
    }
+
 }
@@ -9,14 +9,18 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati

 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import lombok.Getter;

 public class SearchableText {

-
    @JsonIgnore
    @JsonAttribute(ignore = true)
    private transient String stringRepresentation;
+    @Getter
    private final List<TextPositionSequence> sequences = new ArrayList<>();


@@ -40,8 +44,7 @@ public class SearchableText {


    @SuppressWarnings("checkstyle:ModifiedControlVariable")
-    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive,
-                                                     List<TextPositionSequence> sequencesSubList) {
+    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive, List<TextPositionSequence> sequencesSubList) {

        String normalizedSearchString;
        if (caseInsensitive) {
@@ -73,36 +76,27 @@ public class SearchableText {
            for (int j = 0; j < searchSpace.get(i).length(); j++) {

                if (i > 0 && j == 0 && searchSpace.get(i).charAt(0, caseInsensitive) == ' ' && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1)
-                                .length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
-                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
+                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i).charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
                        .charAt(j - 1, caseInsensitive) == ' ') {
-                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions()
-                            .isEmpty()) {
+                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) {
                        crossSequenceParts.add(partMatch);
                    }
                    continue;
                }

                if (j == 0 && searchSpace.get(i).charAt(j, caseInsensitive) != ' ' && i != 0 && searchSpace.get(i - 1)
-                        .charAt(searchSpace.get(i - 1)
-                                .length() - 1, caseInsensitive) != ' ' && searchChars[counter] == ' ') {
+                        .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchChars[counter] == ' ') {
                    counter++;
                }

-                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace
-                        .get(i)
-                        .charAt(j, caseInsensitive) == '-') {
+                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace.get(i).charAt(j, caseInsensitive) == '-') {

-                    if (counter != 0 || i == 0 && j == 0 || j != 0 && SeparatorUtils.isSeparator(searchSpace.get(i)
-                            .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && SeparatorUtils.isSeparator(searchSpace.get(i - 1)
-                            .charAt(searchSpace.get(i - 1)
-                                    .length() - 1, caseInsensitive)) || j == 0 && i != 0 && searchSpace.get(i - 1)
-                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchSpace.get(i)
-                            .charAt(j, caseInsensitive) != ' ') {
-                        partMatch.add(searchSpace.get(i).textPositionAt(j));
-                        if (!(j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
-                                .charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) {
+                    if (counter != 0 || i == 0 && j == 0 || j != 0 && (SeparatorUtils.isSeparator(searchSpace.get(i).charAt(j - 1, caseInsensitive)) || SeparatorUtils.isSeparator(
+                            searchSpace.get(i).charAt(j, caseInsensitive))) || j == 0 && i != 0 && SeparatorUtils.isSeparator(searchSpace.get(i - 1)
+                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive)) || j == 0 && i != 0 && searchSpace.get(i - 1)
+                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchSpace.get(i).charAt(j, caseInsensitive) != ' ') {
+                        partMatch.add(searchSpace.get(i), searchSpace.get(i).textPositionAt(j));
+                        if (!(j == searchSpace.get(i).length() - 1 && searchSpace.get(i).charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) {
                            counter++;
                        }
                    }
@@ -110,14 +104,11 @@ public class SearchableText {
                    if (counter == searchString.length()) {
                        crossSequenceParts.add(partMatch);

-                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
-                                .length() - 1 || j != searchSpace.get(i).length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i)
-                                .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
-                                .length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i + 1)
-                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
-                                .length() - 1 && searchSpace.get(i)
-                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
-                                .charAt(0, caseInsensitive) != ' ') {
+                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i).length() - 1 || j != searchSpace.get(i)
+                                .length() - 1 && (SeparatorUtils.isSeparator(searchSpace.get(i).charAt(j + 1, caseInsensitive)) || SeparatorUtils.isSeparator(searchSpace.get(i)
+                                .charAt(j, caseInsensitive))) || j == searchSpace.get(i).length() - 1 && SeparatorUtils.isSeparator(searchSpace.get(i + 1)
+                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
+                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1).charAt(0, caseInsensitive) != ' ') {
                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts, normalizedSearchString));
                        }

@@ -128,7 +119,7 @@ public class SearchableText {
                } else {
                    counter = 0;
                    if (!crossSequenceParts.isEmpty()) {
-                        j--;
+                        j = j - partMatch.length() - 1;
                    }
                    crossSequenceParts = new ArrayList<>();
                    partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
@@ -144,8 +135,7 @@ public class SearchableText {
    }


-    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts,
-                                                                     String searchString) {
+    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts, String searchString) {

        List<EntityPositionSequence> result = new ArrayList<>();
        String asString = buildString(crossSequenceParts);
@@ -183,10 +173,13 @@ public class SearchableText {

    @Override
    public String toString() {
+
        return buildString(sequences);
    }

+
    public String asString() {
+
        if (stringRepresentation == null) {
            stringRepresentation = buildString(sequences);
        }
@@ -194,7 +187,7 @@ public class SearchableText {
    }


-    public String buildString(List<TextPositionSequence> sequences) {
+    public static String buildString(List<TextPositionSequence> sequences) {

        StringBuilder sb = new StringBuilder();

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

            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(' ');
@@ -212,9 +205,40 @@ public class SearchableText {
            previous = word;
        }

-        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
-                .replaceAll("\n", " ")
-                .replaceAll(" {2}", " ");
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString()).replaceAll("\n", " ").replaceAll(" {2}", " ");
+    }
+
+
+    public String getAsStringWithLinebreaksSorted() {
+
+        return getAsStringWithLinebreaksSorted(this.sequences);
+    }
+
+
+    public String getAsStringWithLinebreaksSorted(List<TextPositionSequence> sequences) {
+
+        var sorted = sequences.stream()
+                .sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getXDirAdj()))
+                .sorted(Comparator.comparing(a -> a.getTextPositions().get(0).getYDirAdj()))
+                .sorted(Comparator.comparing(a -> a.getPage()))
+                .collect(Collectors.toList());
+
+        StringBuilder sb = new StringBuilder();
+
+        TextPositionSequence previous = null;
+        for (TextPositionSequence word : sorted) {
+
+            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 sb.append("\n").toString();
    }


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

            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(' ');
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.Data;

@Data
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.Data;

@Data
@@ -9,4 +10,5 @@ public class FilterGeometry {

    private ImageSize imageSize;
    private ImageFormat imageFormat;
+
 }
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.Data;

@Data
@@ -10,4 +11,5 @@ public class Filters {
    private FilterGeometry geometry;
    private Probability probability;
    private boolean allPassed;
+
 }
@@ -1,11 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model.image;

 import com.dslplatform.json.CompiledJson;
+
 import lombok.Data;

@Data
@CompiledJson
 public class Geometry {
+
    private float width;
    private float height;
+
 }
--- a/Show More
+++ b/Show More