Merge branch 'RED-7668' into 'master'

RED-7669: optimize OCR-module performance

Closes RED-7668

See merge request redactmanager/ocr-service!23

.gitignore

@@ -9,6 +9,49 @@
 **/tmp/
 **/.apt_generated/
 
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### maven build ###
+*.class
+/out/
+/build/
+/target/
+**/out/
+**/build/
+**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+.gradle
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
 
 .factorypath
 .springBeans
@@ -26,3 +69,7 @@
 **/.DS_Store
 **/classpath-data.json
 **/dependencies-and-licenses-overview.txt
+gradle.properties
+gradlew
+gradlew.bat
+gradle/

.gitlab-ci.yml

@@ -0,0 +1,21 @@
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/gradle_java.yml'
+
+deploy:
+  stage: deploy
+  tags:
+    - dind
+  script:
+    - echo "Building with gradle version ${BUILDVERSION}"
+    - gradle -Pversion=${BUILDVERSION} publish
+    - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
+    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+  artifacts:
+    reports:
+      dotenv: version.env
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if: $CI_COMMIT_BRANCH =~ /^release/
+    - if: $CI_COMMIT_TAG

README.md

@@ -0,0 +1,79 @@
+# OCR Service
+## Overview
+The OCR service is a tool designed for extracting text content from PDF files. It utilizes Tesseract, Leptonica, PDFTron, PDFBox, and Ghostscript to perform various tasks, including removing invisible elements and watermarks, extracting images, stitching striped images, binarizing images, running OCR on the processed images, and writing the recognized text back to the original PDF. This service is particularly useful for obtaining machine-readable text from PDF documents.
+
+## Dependencies
+[Tesseract](https://github.com/tesseract-ocr/tesseract)  
+[Leptonica](http://leptonica.org/)  
+[PDFTron](https://apryse.com/)  
+[PDFBox](https://pdfbox.apache.org/)  
+[Ghostscript](https://www.ghostscript.com/)
+## Functionality
+1. Invisible Element and Watermark Removal  
+The service uses PDFTron to attempt the removal of invisible elements and watermarks from the PDF.
+2. Image Extraction  
+  Extracts all images from the PDF using PDFBox
+3. Striped Image Detection and Stitching  
+  Detects if images are striped and stitches them together using Ghostscript.
+4. Binarization  
+  Binarizes the resulting images using Leptonica and the Otsu thresholding algorithm.
+5. OCR Processing  
+Runs Tesseract on the images to extract text.
+6. Text Integration  
+Draws the resulting text onto the original PDF using PDFBox.
+
+Steps 2.-5. happen in parallel and communicate via a blocking queue to limit RAM usage. 
+Therefore, choosing your thread counts carefully leads to most optimal performance.
+For example with 18 available cores, I achieved the highest performance with 2 Image extraction threads, 2 ghostscript processes and 16 OCR threads.  
+
+Setting all threads to basically unlimited (1000+) leads to comparable performance without laborious thread tuning, but at the cost of (potentially a lot) more RAM.
+
+## Installation
+To run the OCR service, ensure that the following dependencies are installed:
+
+1. Ghostscript: Install using apt.
+```bash
+sudo apt install ghostscript
+```
+2. Tesseract and Leptonica: Install using [vcpkg](https://github.com/microsoft/vcpkg) with the command and set the environment variable `VCPKG_DYNAMIC_LIB` to your vcpkg lib folder (e.g. ~/vcpkg/installed/x64-linux-dynamic/lib).
+```bash
+vcpkg install tesseract --triplet x64-linux-dynamic
+```
+```bash
+vcpkg install leptonica --triplet x64-linux-dynamic
+```
+3. Other dependencies are handled by Gradle build
+```bash
+gradle build
+```
+
+## Configuration
+Configuration settings are available in the OcrServiceSettings class.  
+These settings can be overridden using environment variables. e.g.  
+`OCR_SERVICE_OCR_THREAD_COUNT=16`  
+
+Possible configurations and their defaults include:
+
+```java
+int ocrThreadCount = 4; // Number of OCR threads
+int imageExtractThreadCount = 4; // Number of image extraction threads
+int gsProcessCount = 4; // Number of Ghostscript processes
+int dpi = 300; // Target DPI for binarized images
+int psmOverride = -1; // Overrides the page segmentation mode if > 0
+int minImageHeight = 20; // Minimum height for images to be processed
+int minImageWidth = 20; // Minimum width for images to be processed
+boolean debug = false; // If true, overlays OCR images with a grid and draws word bounding boxes
+boolean removeWatermark; // If false, watermarks will not be removed
+String languages = "deu+eng"; // Defines languages loaded into Tesseract as 3-char codes, additional languages must also be installed in the docker environment
+```
+## Integration
+
+The OCR-service communicates via RabbitMQ and uses the queues `ocrQueue`, `ocrDLQ`, and `ocr_status_update_response_queue`. 
+
+### ocrQueue
+This queue is used to start the OCR process, a DocumentRequest must be passed as a message. The service will then download the PDF from the provided cloud storage.
+### ocr_status_update_response_queue
+This queue is used by the OCR service to give updates about the progress of the ongoing OCR on a image per image basis. The total amount may change, when less images are found than initially assumed.
+This queue is also used to signal the end of processing.
+### ocrDLQ
+This queue is used to signal an error has occurred during processing.

bamboo-specs/pom.xml

@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.atlassian.bamboo</groupId>
-        <artifactId>bamboo-specs-parent</artifactId>
-        <version>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>

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

@@ -1,125 +0,0 @@
-package buildjob;
-
-import static com.atlassian.bamboo.specs.builders.task.TestParserTask.createJUnitParserTask;
-
-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.Variable;
-import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
-import com.atlassian.bamboo.specs.api.builders.permission.PermissionType;
-import com.atlassian.bamboo.specs.api.builders.permission.Permissions;
-import com.atlassian.bamboo.specs.api.builders.permission.PlanPermissions;
-import com.atlassian.bamboo.specs.api.builders.plan.Job;
-import com.atlassian.bamboo.specs.api.builders.plan.Plan;
-import com.atlassian.bamboo.specs.api.builders.plan.PlanIdentifier;
-import com.atlassian.bamboo.specs.api.builders.plan.Stage;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.BranchCleanup;
-import com.atlassian.bamboo.specs.api.builders.plan.branches.PlanBranchManagement;
-import com.atlassian.bamboo.specs.api.builders.project.Project;
-import com.atlassian.bamboo.specs.builders.task.CheckoutItem;
-import com.atlassian.bamboo.specs.builders.task.InjectVariablesTask;
-import com.atlassian.bamboo.specs.builders.task.ScriptTask;
-import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
-import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
-import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
-import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
-import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
-import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location;
-import com.atlassian.bamboo.specs.util.BambooServer;
-
-/**
- * Plan configuration for Bamboo.
- * Learn more on: <a href="https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs">https://confluence.atlassian.com/display/BAMBOO/Bamboo+Specs</a>
- */
-@BambooSpec
-public class PlanSpec {
-
-    private static final String SERVICE_NAME = "ocr-service";
-
-    private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
-
-
-    /**
-     * Run main to publish plan on Bamboo
-     */
-    public static void main(final String[] args) throws Exception {
-        //By default credentials are read from the '.credentials' file.
-        BambooServer bambooServer = new BambooServer("http://localhost:8085");
-
-        Plan plan = new PlanSpec().createPlan();
-        bambooServer.publish(plan);
-        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
-        bambooServer.publish(planPermission);
-
-        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/conf/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").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.6.2-jdk-13-3.0.0")
-                                .dockerRunArguments("--net=host")
-                                .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 ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
-    }
-
-}

bamboo-specs/src/main/resources/scripts/build-java.sh

@@ -1,62 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
-then
-	echo "building on master branch"
-    branchVersion=$(cat pom.xml | grep -Eo "<version>.*" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|')
-	echo "branch version is : $branchVersion"
-    latestVersion=$(semver $( git tag -l $branchVersion.* ) | tail -n1)
-	echo "latestVersion is : $latestVersion"
-    newVersion="$(semver $latestVersion -p -i minor)"
-	echo "newVersion is : $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)"
-elif [[ "${bamboo_version_tag}" != "dev" ]]
-then
-    newVersion="${bamboo_version_tag}"
-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 "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 \
-    versions:set \
-    -DnewVersion=${newVersion}
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    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

bamboo-specs/src/main/resources/scripts/sonar-java.sh

@@ -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

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

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

buildSrc/build.gradle.kts

@@ -0,0 +1,15 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+plugins {
+    // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build.
+    `kotlin-dsl`
+}
+
+repositories {
+    // Use the plugin portal to apply community plugins in convention plugins.
+    gradlePluginPortal()
+}

buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts

@@ -0,0 +1,64 @@
+plugins {
+    `java-library`
+    pmd
+    checkstyle
+    jacoco
+}
+
+group = "com.knecon.fforesight.service"
+
+
+
+java.sourceCompatibility = JavaVersion.VERSION_17
+java.targetCompatibility = JavaVersion.VERSION_17
+
+tasks.pmdMain {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
+}
+
+tasks.pmdTest {
+    pmd.ruleSetFiles = files("${rootDir}/config/pmd/test_pmd.xml")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+    reports {
+        junitXml.outputLocation.set(layout.buildDirectory.dir("reports/junit"))
+    }
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+        html.outputLocation.set(layout.buildDirectory.dir("jacocoHtml"))
+    }
+}
+
+java {
+    withJavadocJar()
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri("https://nexus.knecon.com/repository/gindev/")
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull()
+            password = providers.gradleProperty("mavenPassword").getOrNull()
+        }
+    }
+    maven {
+        url = uri("https://nexus.knecon.com/repository/PDFTron/")
+        credentials {
+            username = providers.gradleProperty("mavenUser").getOrNull()
+            password = providers.gradleProperty("mavenPassword").getOrNull()
+        }
+    }
+    mavenCentral()
+}

config/checkstyle/checkstyle.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property
+            name="severity"
+            value="error"/>
+    <module name="TreeWalker">
+        <module name="SuppressWarningsHolder"/>
+        <module name="MissingDeprecated"/>
+        <module name="MissingOverride"/>
+        <module name="AnnotationLocation"/>
+        <module name="JavadocStyle"/>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="IllegalImport"/>
+        <module name="RedundantImport"/>
+        <module name="RedundantModifier"/>
+        <module name="EmptyBlock"/>
+        <module name="DefaultComesLast"/>
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="ExplicitInitialization"/>
+        <module name="IllegalInstantiation"/>
+        <module name="ModifiedControlVariable"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="PackageDeclaration"/>
+        <module name="ParameterAssignment"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+        <module name="StringLiteralEquality"/>
+        <module name="OneStatementPerLine"/>
+        <module name="FinalClass"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+        <module name="OuterTypeFilename"/>
+    </module>
+    <module name="FileTabCharacter"/>
+    <module name="SuppressWarningsFilter"/>
+</module>

config/pmd/pmd.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon ruleset checks the code for bad stuff
+    </description>
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+    </rule>
+
+</ruleset>

config/pmd/test_pmd.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruleset name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+
+    <description>
+        Knecon test ruleset checks the code for bad stuff
+    </description>
+
+
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="DataflowAnomalyAnalysis"/>
+        <exclude name="MissingSerialVersionUID"/>
+        <exclude name="NullAssignment"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="TestClassWithoutTestCases"/>
+    </rule>
+
+</ruleset>

gradle.properties.kts

@@ -0,0 +1 @@
+version = 4.0-SNAPSHOT

ocr-service-image-v1/pom.xml

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.iqser.red</groupId>
-        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>ocr-service-image-v1</artifactId>
-    <groupId>com.iqser.red.service</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <service.server>ocr-service-server-v1</service.server>
-        <platform.jar>${service.server}.jar</platform.jar>
-        <docker.skip.push>false</docker.skip.push>
-        <docker.image.name>${docker.image.prefix}/${service.server}</docker.image.name>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>download-platform-jar</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <artifactItems>
-                                    <dependency>
-                                        <groupId>${project.groupId}</groupId>
-                                        <artifactId>${service.server}</artifactId>
-                                        <version>${version}</version>
-                                        <type>jar</type>
-                                        <overWrite>true</overWrite>
-                                        <destFileName>${platform.jar}</destFileName>
-                                    </dependency>
-                                </artifactItems>
-                                <outputDirectory>${docker.build.directory}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>docker-maven-plugin</artifactId>
-                    <configuration>
-                        <images>
-                            <image>
-                                <name>${docker.image.name}</name>
-                                <build>
-                                    <dockerFileDir>${docker.build.directory}</dockerFileDir>
-                                    <args>
-                                        <PLATFORM_JAR>${platform.jar}</PLATFORM_JAR>
-                                    </args>
-                                    <tags>
-                                        <tag>${docker.image.version}</tag>
-                                        <tag>latest</tag>
-                                    </tags>
-                                </build>
-                            </image>
-                        </images>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>copy-resources</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${basedir}/target/build/libs/</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory>libs</directory>
-                                        <filtering>false</filtering>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>

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

@@ -1,18 +0,0 @@
-FROM red/base-image:2.0.2
-
-COPY "libs/pdftron/OCRModuleLinux.tar.gz" .
-RUN tar xvzf OCRModuleLinux.tar.gz
-RUN mkdir /OCRModule
-RUN mv Lib/* /OCRModule/
-
-RUN apt-get -y update
-# Ghostscript somehow improves ocr quality using pdfton, do not remove!
-RUN apt-get -y install ghostscript
-
-ARG PLATFORM_JAR
-
-ENV PLATFORM_JAR ${PLATFORM_JAR}
-
-ENV USES_ELASTICSEARCH false
-
-COPY ["${PLATFORM_JAR}", "/"]

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

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.iqser.red.service</groupId>
-        <artifactId>ocr-service-v1</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>ocr-service-api-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <properties>
-        <persistence-service.version>2.1.0</persistence-service.version>
-        <dsljson.version>1.9.9</dsljson.version>
-    </properties>
-
-    <dependencies>
-
-        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>${dsljson.version}</version>
-        </dependency>
-
-        <dependency>
-            <!-- This dependency contains annotations that are used in specifying REST endpoints. -->
-            <!-- It is optional since not all users of this API might use Feign. -->
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-internal-api-v1</artifactId>
-            <version>${persistence-service.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>

ocr-service-v1/ocr-service-api-v1/src/test/java/com/iqser/red/service/ocr/v1/api/model/IdentityTest.java

@@ -1,17 +0,0 @@
-package com.iqser.red.service.ocr.v1.api.model;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.jupiter.api.Test;
-
-public class IdentityTest {
-
-    @Test
-    public void mockTest() {
-
-        int i = 1;
-        assertThat(i).isEqualTo(1);
-    }
-
-}
-

ocr-service-v1/ocr-service-api/build.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+    `maven-publish`
+    id("com.iqser.red.service.java-conventions")
+    id("io.freefair.lombok") version "8.2.2"
+}
+
+publishing {
+    publications {
+        create<MavenPublication>(name) {
+            from(components["java"])
+        }
+    }
+    repositories {
+        maven {
+            url = uri("https://nexus.knecon.com/repository/red-platform-releases/")
+            credentials {
+                username = providers.gradleProperty("mavenUser").getOrNull();
+                password = providers.gradleProperty("mavenPassword").getOrNull();
+            }
+        }
+    }
+}

ocr-service-v1/ocr-service-api/src/main/java/com/knecon/fforesight/service/ocr/v1/api/model/DocumentRequest.java

@@ -1,13 +1,14 @@
-package com.iqser.red.service.ocr.v1.api.model;
+package com.knecon.fforesight.service.ocr.v1.api.model;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 @Data
-@NoArgsConstructor
+@Builder
 @AllArgsConstructor
+@NoArgsConstructor
 public class DocumentRequest {
 
     protected String dossierId;

ocr-service-v1/ocr-service-api/src/main/java/com/knecon/fforesight/service/ocr/v1/api/model/OCRStatusUpdateResponse.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.ocr.v1.api.model;
+package com.knecon.fforesight.service.ocr.v1.api.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -6,9 +6,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class OCRStatusUpdateResponse {
 
     private String fileId;

ocr-service-v1/ocr-service-processor/build.gradle.kts

@@ -0,0 +1,28 @@
+plugins {
+    id("com.iqser.red.service.java-conventions")
+    id("io.freefair.lombok") version "8.2.2"
+}
+
+configurations {
+    all {
+        exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging")
+    }
+}
+
+dependencies {
+    api("com.iqser.red.service:persistence-service-internal-api-v1:2.224.0")
+    api("net.sourceforge.tess4j:tess4j:5.8.0")
+    api("com.iqser.red.commons:metric-commons:2.1.0")
+    api("com.iqser.red.commons:storage-commons:2.45.0")
+    api("com.knecon.fforesight:tenant-commons:0.13.0")
+    api("com.pdftron:PDFNet:10.5.0")
+    api("org.apache.pdfbox:pdfbox:3.0.0")
+    api("org.apache.pdfbox:jbig2-imageio:3.0.4")
+    api("com.github.jai-imageio:jai-imageio-core:1.4.0")
+    api("com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0")
+    api("io.github.karols:hocr4j:0.1.2")
+    api("com.amazonaws:aws-java-sdk-kms:1.12.440")
+    api("com.google.guava:guava:31.1-jre")
+    api("com.iqser.red.commons:pdftron-logic-commons:2.20.0")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/OcrServiceProcessorConfiguration.java

@@ -0,0 +1,14 @@
+package com.knecon.fforesight.service.ocr.processor;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+
+@Configuration
+@ComponentScan
+@EnableConfigurationProperties(OcrServiceSettings.class)
+public class OcrServiceProcessorConfiguration {
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/initializer/PDFNetInitializer.java

@@ -1,13 +1,14 @@
-package com.iqser.red.service.ocr.v1.server.initializer;
+package com.knecon.fforesight.service.ocr.processor.initializer;
 
 import com.pdftron.pdf.PDFNet;
+import com.sun.jna.NativeLibrary;
+
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 @RequiredArgsConstructor
 public class PDFNetInitializer {
@@ -15,9 +16,6 @@ public class PDFNetInitializer {
     @Value("${pdftron.license:}")
     private String pdftronLicense;
 
-    @Value("${pdftron.ocrmodule.path:/tmp}")
-    private String ocrModulePath;
-
 
     @SneakyThrows
     @PostConstruct
@@ -25,7 +23,7 @@ public class PDFNetInitializer {
     public void init() {
 
         PDFNet.setTempPath("/tmp/pdftron");
-        PDFNet.addResourceSearchPath(ocrModulePath);
         PDFNet.initialize(pdftronLicense);
+        System.setProperty("jna.library.path", System.getenv("VCPKG_DYNAMIC_LIB"));
     }
 }

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedImage.java

@@ -0,0 +1,36 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+
+import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
+import org.apache.pdfbox.util.Matrix;
+
+import com.knecon.fforesight.service.ocr.processor.utils.ImageProcessingUtils;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.lept4j.util.LeptUtils;
+
+public record ExtractedImage(
+        int pageNumber, QuadPoint position, int height, int width, BufferedImage image, Matrix ctm, int numberOnPage, PDColorSpace colorSpace) implements UnprocessedImage {
+
+    @SneakyThrows
+    public Pix asPix() {
+
+        BufferedImage image = ImageProcessingUtils.convertToDeviceColorSpace(this);
+        ImageProcessingUtils.setAlphaChannelToWhite(image);
+        return LeptUtils.convertImageToPix(image);
+    }
+
+
+    public QuadPoint getImageCoordinatesInInitialUserSpace() {
+
+        return QuadPoint.fromRectangle2D(new Rectangle2D.Double(0, 0, 1, 1)).getTransformed(ctm.createAffineTransform());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedOcrImage.java

@@ -0,0 +1,68 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.Graphics;
+import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
+
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.util.Matrix;
+
+import com.knecon.fforesight.service.ocr.processor.service.threads.OCRThread;
+import com.knecon.fforesight.service.ocr.processor.utils.ImageProcessingUtils;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.tess4j.ITessAPI;
+
+@Slf4j
+@Getter
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ExtractedOcrImage implements OcrImage {
+
+    int pageNumber;
+    int numberOnPage;
+    int originalHeight;
+    int originalWidth;
+    Matrix ctm;
+    Pix pix;
+    int height;
+    int width;
+    int rotationDegrees;
+
+
+    @Override
+    public AffineTransform getImageCTM() {
+
+        AffineTransform affineTransform = ctm.createAffineTransform();
+
+        affineTransform.scale((double) 1 / getWidth(), (double) 1 / getHeight());
+
+        AffineTransform deRotationMatrix = switch (360 - rotationDegrees) {
+            case 90 -> new AffineTransform(0, 1, -1, 0, getHeight(), 0);
+            case 180 -> new AffineTransform(-1, 0, 0, -1, getWidth(), getHeight());
+            case 270 -> new AffineTransform(0, -1, 1, 0, getWidth() - getHeight(), getHeight()); // results from 90 + 180 rotations
+            default -> new AffineTransform();
+        };
+
+        affineTransform.concatenate(deRotationMatrix);
+        AffineTransform mirrorTransform = new AffineTransform(1, 0, 0, -1, 0, getHeight());
+        affineTransform.concatenate(mirrorTransform);
+        return affineTransform;
+    }
+
+
+    @Override
+    public int getOptimalPageSegmentationMode() {
+
+        return ITessAPI.TessPageSegMode.PSM_SINGLE_BLOCK;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/FontMetrics.java

@@ -0,0 +1,17 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@AllArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public final class FontMetrics {
+
+    float descent; // descent is the part of the text which is below the baseline, e.g. the lower curve of a 'g'. https://en.wikipedia.org/wiki/Body_height_(typography)
+    float fontSize;
+    float heightScaling;
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/HeightAndDescent.java

@@ -0,0 +1,5 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+public record HeightAndDescent(float height, float descent) {
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrImage.java

@@ -0,0 +1,128 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+
+import com.knecon.fforesight.service.ocr.processor.service.threads.OCRThread;
+import com.knecon.fforesight.service.ocr.processor.utils.PdfDpiCalculator;
+
+import lombok.SneakyThrows;
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.lept4j.util.LeptUtils;
+
+public interface OcrImage {
+
+    /**
+     * Retrieves the page number where the OCR image is located. It uses 1-based-index.
+     *
+     * @return The page number where the OCR image is located.
+     */
+    int getPageNumber();
+
+
+    /**
+     * Retrieves the number of this image on the page. For full page images this always returns 0.
+     *
+     * @return The number of this image on the page.
+     */
+    int getNumberOnPage();
+
+
+    int getHeight();
+
+
+    int getWidth();
+
+
+    /**
+     * Gets the outer boundary of the image in image coordinates. (0,0) is upper left corner. And height and width is the image size
+     *
+     * @return the QuadPoint representing the size of the image
+     */
+    default QuadPoint getImageBounds() {
+
+        // cannot be solved with a nice rotation matrix, since the after rotating the text coordinates in the image will always start at (0,0) and will therefore always start at (0,0) in the PDF.
+        // So in order to mimic this behavior we need to start with (0,0) coordinates always.
+        if (getRotationDegrees() == 90 || getRotationDegrees() == 270) {
+            return new QuadPoint(new Point2D.Double(0, 0), new Point2D.Double(0, getWidth()), new Point2D.Double(getHeight(), getWidth()), new Point2D.Double(getHeight(), 0));
+        } else {
+            return new QuadPoint(new Point2D.Double(0, 0), new Point2D.Double(0, getHeight()), new Point2D.Double(getWidth(), getHeight()), new Point2D.Double(getWidth(), 0));
+        }
+    }
+
+
+    /**
+     * Retrieves the image coordinates in the PDF by transforming the image bounds using the current transformation matrix (CTM).
+     *
+     * @return The image coordinates as a QuadPoint object.
+     */
+    default QuadPoint getImageCoordinatesInInitialUserSpace() {
+
+        return getImageBounds().getTransformed(getImageCTM());
+    }
+
+
+    @SneakyThrows
+    default BufferedImage getBufferedImage() {
+
+        return LeptUtils.convertPixToImage(getPix());
+    }
+
+
+    /**
+     * Retrieves the rotation degree of the OCR image.
+     *
+     * @return The rotation degree of the OCR image.
+     */
+    int getRotationDegrees();
+
+
+    /**
+     * Retrieves the optimal page segmentation mode for the OCR image.
+     *
+     * @return The optimal page segmentation mode.
+     */
+    int getOptimalPageSegmentationMode(); // TODO: evaluate if PSM can be dynamically chosen to increase performance
+
+
+    /**
+     * Retrieves the buffered image associated with the OCR image.
+     *
+     * @return The BufferedImage object representing the image.
+     */
+    Pix getPix();
+
+
+    default int getDpi() {
+
+        return PdfDpiCalculator.calculateDpi(getImageBounds(), getImageCTM(), getWidth());
+    }
+
+
+    /**
+     * Retrieves the current transformation matrix (CTM). The CTM may be used to transform the image coordinates to Initial User Space coordinates.
+     *
+     * @return The AffineTransform representing the current transformation matrix.
+     */
+    AffineTransform getImageCTM();
+
+
+    /**
+     * Retrieves the size (width * height) of the image.
+     *
+     * @return The size of the image.
+     */
+    default int getImageSize() {
+
+        return getHeight() * getWidth();
+    }
+
+
+    default void destroyPix() {
+
+        LeptUtils.disposePix(getPix());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrResult.java

@@ -0,0 +1,33 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.AffineTransform;
+import java.util.List;
+
+import com.knecon.fforesight.service.ocr.processor.service.HOcrPageParser;
+
+import io.github.karols.hocr4j.Word;
+
+public record OcrResult(Image image, String hOcrPageAbsolutePath) {
+
+    public static OcrResult create(OcrImage image, String tesseractResult) {
+
+        return new OcrResult(Image.fromOcrImage(image), tesseractResult);
+    }
+
+
+    public List<Word> getAllWords() {
+
+        return HOcrPageParser.extractHocrPage(hOcrPageAbsolutePath).getAllWords();
+    }
+
+
+    public record Image(Integer pageNumber, AffineTransform ctm, QuadPoint position) {
+
+        public static Image fromOcrImage(OcrImage image) {
+
+            return new Image(image.getPageNumber(), image.getImageCTM(), image.getImageCoordinatesInInitialUserSpace());
+        }
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/PageInformation.java

@@ -0,0 +1,12 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import org.apache.pdfbox.pdmodel.PDPage;
+
+public record PageInformation(int height, int width, int number, int rotationDegrees) {
+
+    public static PageInformation fromPDPage(int pageNum, PDPage page) {
+
+        return new PageInformation((int) page.getCropBox().getHeight(), (int) page.getCropBox().getWidth(), pageNum, page.getRotation());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/QuadPoint.java

@@ -0,0 +1,106 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.util.List;
+
+import io.github.karols.hocr4j.Bounds;
+
+public record QuadPoint(Point2D a, Point2D b, Point2D c, Point2D d) {
+
+    /*
+    B _____ C
+     |     |
+    A|_____|D
+    */
+
+
+    public static QuadPoint fromRectangle2D(Rectangle2D rectangle2D) {
+
+        return new QuadPoint(new Point2D.Double(rectangle2D.getX(), rectangle2D.getY()),
+                new Point2D.Double(rectangle2D.getX(), rectangle2D.getMaxY()),
+                new Point2D.Double(rectangle2D.getMaxX(), rectangle2D.getMaxY()),
+                new Point2D.Double(rectangle2D.getMaxX(), rectangle2D.getY()));
+    }
+
+
+    public static QuadPoint fromBounds(Bounds bounds) {
+
+        return new QuadPoint(new Point2D.Double(bounds.getLeft(), bounds.getBottom()),
+                new Point2D.Double(bounds.getLeft(), bounds.getTop()),
+                new Point2D.Double(bounds.getRight(), bounds.getTop()),
+                new Point2D.Double(bounds.getRight(), bounds.getBottom()));
+    }
+
+
+    public QuadPoint getTransformed(AffineTransform at) {
+
+        return new QuadPoint(at.transform(a, null), at.transform(b, null), at.transform(c, null), at.transform(d, null));
+    }
+
+
+    /**
+     * Determines if the given QuadPoint aligns with this QuadPoint within a given threshold.
+     * It does os by trying every possible combination of aligning sides. It starts with the most likely combination of ab and cd.
+     *
+     * @param other     The QuadPoint to compare with.
+     * @param threshold The maximum distance allowed for alignment.
+     * @return True if the QuadPoints align within the threshold, false otherwise.
+     */
+    public boolean aligns(QuadPoint other, double threshold) {
+
+        Line2D ab = new Line2D.Double(a, b);
+        Line2D bc = new Line2D.Double(b, c);
+        Line2D cd = new Line2D.Double(c, d);
+        Line2D da = new Line2D.Double(d, a);
+
+        Line2D ab2 = new Line2D.Double(other.a, other.b);
+        Line2D bc2 = new Line2D.Double(other.b, other.c);
+        Line2D cd2 = new Line2D.Double(other.c, other.d);
+        Line2D da2 = new Line2D.Double(other.d, other.a);
+
+        List<Line2D> lines = List.of(ab, cd, bc, da);
+        List<Line2D> lines2 = List.of(cd2, ab2, bc2, da2);
+        return lines.stream().anyMatch(line -> lines2.stream().anyMatch(line2 -> aligns(line, line2, threshold)));
+    }
+
+
+    private static boolean aligns(Line2D a, Line2D b, double threshold) {
+
+        return aligns(a.getP1(), a.getP2(), b.getP1(), b.getP2(), threshold);
+    }
+
+
+    private static boolean aligns(Point2D a, Point2D b, Point2D a2, Point2D b2, double threshold) {
+
+        if (a.distance(a2) < threshold && b.distance(b2) < threshold) {
+            return true;
+        }
+        return a.distance(b2) < threshold && b.distance(a2) < threshold;
+
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.format("A:(%.2f, %.2f) | B:(%.2f, %.2f) | C:(%.2f, %.2f) | D:(%.2f, %.2f)",
+                a().getX(),
+                a().getY(),
+                b().getX(),
+                b().getY(),
+                c().getX(),
+                c().getY(),
+                d().getX(),
+                d().getY());
+    }
+
+
+    public double size() {
+
+        return a().distance(b()) * a().distance(d());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageImageFile.java

@@ -0,0 +1,14 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+
+public record RenderedPageImageFile(int pageNumber, String absoluteFilePath) implements UnprocessedImage {
+
+    @Override
+    public Pix asPix() {
+
+        return Leptonica1.pixRead(absoluteFilePath);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java

@@ -0,0 +1,108 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.tess4j.ITessAPI;
+
+@Getter
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class RenderedPageOcrImage implements OcrImage {
+
+    int height;
+    int width;
+    PageInformation pageInformation;
+    Pix pix;
+    int rotationDegrees;
+
+
+    @Override
+    public int getOptimalPageSegmentationMode() {
+
+        return ITessAPI.TessPageSegMode.PSM_SINGLE_BLOCK;
+    }
+
+
+    @Override
+    public AffineTransform getImageCTM() {
+
+        double scalingFactor = calculateScalingFactor();
+        AffineTransform imageToCropBoxScaling = new AffineTransform(scalingFactor, 0, 0, scalingFactor, 0, 0);
+
+        AffineTransform mirrorMatrix = new AffineTransform(1, 0, 0, -1, 0, pageInformation.height());
+
+        AffineTransform rotationMatrix = switch (calculateTotalRotation()) {
+            case 90 -> new AffineTransform(0, 1, -1, 0, pageInformation.height(), 0);
+            case 180 -> new AffineTransform(-1, 0, 0, -1, pageInformation.width(), pageInformation.height());
+            case 270 -> new AffineTransform(0, -1, 1, 0, pageInformation.width() - pageInformation.height(), pageInformation.height()); // results from 90 + 180 rotations
+            default -> new AffineTransform();
+        };
+
+        // matrix multiplication is performed from right to left, so the order is reversed.
+        // scaling -> mirror -> rotation
+        AffineTransform resultMatrix = new AffineTransform();
+
+        resultMatrix.concatenate(rotationMatrix);
+        resultMatrix.concatenate(mirrorMatrix);
+        resultMatrix.concatenate(imageToCropBoxScaling);
+        return resultMatrix;
+    }
+
+
+    private int calculateTotalRotation() {
+
+        return (pageInformation.rotationDegrees() + (360 - rotationDegrees)) % 360;
+    }
+
+
+    @Override
+    public QuadPoint getImageBounds() {
+
+        if (rotationDegrees == 90 || rotationDegrees == 270) {
+            return new QuadPoint(new Point2D.Double(0, 0), new Point2D.Double(0, width), new Point2D.Double(height, width), new Point2D.Double(height, 0));
+        } else {
+            return new QuadPoint(new Point2D.Double(0, 0), new Point2D.Double(0, height), new Point2D.Double(width, height), new Point2D.Double(width, 0));
+        }
+    }
+
+
+    @Override
+    public int getPageNumber() {
+
+        return pageInformation.number();
+    }
+
+
+    @Override
+    public int getNumberOnPage() {
+
+        return 0;
+    }
+
+
+    private double calculateScalingFactor() {
+
+        // PDFBox always returns page height and width based on rotation
+        double pageWidth;
+        if (pageInformation.rotationDegrees() == 90 || pageInformation.rotationDegrees() == 270) {
+            pageWidth = pageInformation.height();
+        } else {
+            pageWidth = pageInformation.width();
+        }
+
+        return pageWidth / width;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/TextPositionInImage.java

@@ -0,0 +1,122 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.util.Matrix;
+
+import com.knecon.fforesight.service.ocr.processor.service.fonts.FontMetricsFactory;
+
+import io.github.karols.hocr4j.Bounds;
+import io.github.karols.hocr4j.Word;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.experimental.FieldDefaults;
+
+@Getter
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+public class TextPositionInImage {
+
+    QuadPoint position;
+    String text;
+    AffineTransform imageCTM;
+    FontMetricsFactory fontMetricsFactory;
+
+
+    public TextPositionInImage(Word word, AffineTransform imageCTM, FontMetricsFactory fontMetricsFactory) {
+
+        this.position = QuadPoint.fromBounds(word.getBounds());
+        this.text = word.getText();
+        this.imageCTM = imageCTM;
+        this.fontMetricsFactory = fontMetricsFactory;
+    }
+
+
+    public QuadPoint getTransformedTextBBox() {
+
+        return position.getTransformed(imageCTM);
+    }
+
+
+    public PDFont getFont() {
+
+        return fontMetricsFactory.getFont();
+    }
+
+
+    public Matrix getTextMatrix() {
+
+        FontMetrics metrics = fontMetricsFactory.calculateMetrics(text, getTransformedWidth(), getTransformedHeight());
+
+        // Matrix multiplication is from right to left:
+        // convert to image coords -> subtract descent -> scale height -> reverse imageCTM scaling -> translate to coordinates in image -> convert to pdf coords
+        // width must not be set, since it is scaled with the fontsize attribute
+
+        AffineTransform ctm = new AffineTransform();
+        ctm.concatenate(imageCTM);
+        ctm.translate(position.a().getX(), position.a().getY());
+        ctm.scale(getWidth() / getTransformedWidth(),
+                getHeight() / getTransformedHeight()); // scale with transformation coefficient, such that fontsize may be set with transformed width.
+        ctm.scale(1, metrics.getHeightScaling());
+        ctm.translate(0, metrics.getDescent());
+        ctm.concatenate(new AffineTransform(1, 0, 0, -1, 0, 0)); // start in image coordinates, with (0,0) being top left and negative height.
+
+        return new Matrix(ctm);
+    }
+
+
+    public double getFontSize() {
+
+        return fontMetricsFactory.calculateFontSize(text, getTransformedWidth());
+    }
+
+
+    public double getTransformedWidth() {
+
+        return transformedA().distance(transformedD());
+    }
+
+
+    public double getTransformedHeight() {
+
+        return transformedA().distance(transformedB());
+    }
+
+
+    public double getWidth() {
+
+        return position.a().distance(position.d());
+    }
+
+
+    public double getHeight() {
+
+        return position.a().distance(position.b());
+    }
+
+
+    public Point2D transformedA() {
+
+        return imageCTM.transform(position.a(), null);
+    }
+
+
+    public Point2D transformedB() {
+
+        return imageCTM.transform(position.b(), null);
+    }
+
+
+    public Point2D transformedC() {
+
+        return imageCTM.transform(position.c(), null);
+    }
+
+
+    public Point2D transformedD() {
+
+        return imageCTM.transform(position.d(), null);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/UnprocessedImage.java

@@ -0,0 +1,9 @@
+package com.knecon.fforesight.service.ocr.processor.model;
+
+import net.sourceforge.lept4j.Pix;
+
+public interface UnprocessedImage {
+
+    Pix asPix();
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/FileStorageService.java

@@ -1,15 +1,18 @@
-package com.iqser.red.service.ocr.v1.server.service;
+package com.knecon.fforesight.service.ocr.processor.service;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.ocr.v1.server.model.image.ImageServiceResponse;
-import com.iqser.red.service.ocr.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.storage.commons.service.StorageService;
+import com.knecon.fforesight.tenantcommons.TenantContext;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -32,14 +35,16 @@ public class FileStorageService {
     @SneakyThrows
     public byte[] getOriginalFile(String dossierId, String fileId) {
 
-        return IOUtils.toByteArray(storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream());
+        try (InputStream inputStream = getInputStream(getStorageId(dossierId, fileId, FileType.ORIGIN))) {
+            return IOUtils.toByteArray(inputStream);
+        }
     }
 
 
     @SneakyThrows
     public InputStream getOriginalFileAsStream(String dossierId, String fileId) {
 
-        return storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream();
+        return getInputStream(getStorageId(dossierId, fileId, FileType.ORIGIN));
     }
 
 
@@ -62,9 +67,11 @@ public class FileStorageService {
 
 
     @SneakyThrows
-    public ImageServiceResponse getImageServiceResponse(String dossierId, String fileId) {
+    private InputStream getInputStream(String storageId) {
 
-        return storageService.readJSONObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.IMAGE_INFO), ImageServiceResponse.class);
+        File tempFile = File.createTempFile("temp", ".data");
+        storageService.downloadTo(TenantContext.getTenantId(), storageId, tempFile);
+        return Files.newInputStream(Paths.get(tempFile.getPath()), StandardOpenOption.DELETE_ON_CLOSE);
     }
 
 }

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/GhostScriptService.java

@@ -0,0 +1,176 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedTransferQueue;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.stereotype.Service;
+
+import com.azure.core.implementation.GeoObjectHelper;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.PageInformation;
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageImageFile;
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageOcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.UnprocessedImage;
+import com.knecon.fforesight.service.ocr.processor.service.threads.BlockingQueueFiller;
+import com.knecon.fforesight.service.ocr.processor.service.threads.GhostScriptOutputHandler;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+import com.knecon.fforesight.service.ocr.processor.utils.ListSplittingUtils;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.lept4j.Pix;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+@SuppressWarnings("PMD") // can't figure out how to safely close the stdOut and stdError streams in line 142/144
+public class GhostScriptService {
+
+    static String FORMAT = ".tiff";
+    static String DEVICE = "tiffgray";
+    OcrServiceSettings settings;
+
+
+    @SneakyThrows
+    public void renderPagesAsImagesBatchedAndAddToQueue(List<Integer> stitchedPageNumbers,
+                                                        String documentAbsolutePath,
+                                                        Path tmpImageDir,
+                                                        PDDocument document,
+                                                        BlockingQueue<UnprocessedImage> imageProcessingQueue,
+                                                        Statistics stats) {
+
+        BlockingQueue<RenderedPageImageFile> imageFileCollectorQueue = new LinkedBlockingDeque<>();
+        Thread asyncTransferThread = new BlockingQueueFiller(imageFileCollectorQueue, imageProcessingQueue);
+        asyncTransferThread.start();
+        int numOfProcesses = Math.min(settings.getGsProcessCount(), stitchedPageNumbers.size());
+
+        List<List<ProcessInfo>> processInfoBatches = buildSubListForEachProcess(stitchedPageNumbers,
+                numOfProcesses,
+                256 * numOfProcesses); // GS has a limit on how many pageIndices per call are possible, so we limit it to 256 pages per process
+        for (int batchIdx = 0; batchIdx < processInfoBatches.size(); batchIdx++) {
+            long timestamp = System.currentTimeMillis();
+            List<ProcessInfo> processInfos = processInfoBatches.get(batchIdx);
+
+            log.info("Batch {}: Running {} gs processes with ({}) pages each",
+                    batchIdx,
+                    processInfos.size(),
+                    processInfos.stream().map(info -> info.stitchedPageNumbers().size()).map(String::valueOf).collect(Collectors.joining(", ")));
+
+            int finalBatchIdx = batchIdx;
+            List<Process> processes = processInfos.stream()
+                    .parallel()
+                    .map(info -> buildCmdArgs(info.processIdx(), finalBatchIdx, info.stitchedPageNumbers(), tmpImageDir, documentAbsolutePath))
+                    .peek(s -> log.debug(String.join(" ", s.cmdArgs())))
+                    .map(processInfo -> executeProcess(processInfo, imageFileCollectorQueue))
+                    .toList();
+
+            List<Integer> processExitCodes = new LinkedList<>();
+            for (Process process : processes) {
+                processExitCodes.add(process.waitFor());
+            }
+            stats.increasePDF2ImgDuration(System.currentTimeMillis() - timestamp);
+            log.info("Batch {}: Ghostscript processes finished with exit codes " + processExitCodes, batchIdx);
+        }
+        asyncTransferThread.interrupt();
+    }
+
+
+    private List<List<ProcessInfo>> buildSubListForEachProcess(List<Integer> stitchedPageNumbers, int processCount, int batchSize) {
+
+        // GhostScript command line can only handle so many page numbers at once, so we split it into batches
+        int batchCount = (int) Math.ceil((double) stitchedPageNumbers.size() / batchSize);
+
+        log.info("Splitting {} page renderings across {} process(es) in {} batch(es) with size {}", stitchedPageNumbers.size(), processCount, batchCount, batchSize);
+
+        List<List<ProcessInfo>> processInfoBatches = new ArrayList<>(batchCount);
+        List<List<List<Integer>>> batchedBalancedSublist = ListSplittingUtils.buildBatchedBalancedSublist(stitchedPageNumbers.stream().sorted().toList(), processCount, batchCount);
+
+        for (var batch : batchedBalancedSublist) {
+            List<ProcessInfo> processInfos = new ArrayList<>(processCount);
+            for (int threadIdx = 0; threadIdx < batch.size(); threadIdx++) {
+                List<Integer> balancedPageNumbersSubList = batch.get(threadIdx);
+                processInfos.add(new ProcessInfo(threadIdx, balancedPageNumbersSubList));
+            }
+            processInfoBatches.add(processInfos);
+        }
+        return processInfoBatches;
+    }
+
+
+    @SneakyThrows
+    private ProcessCmdsAndRenderedImageFiles buildCmdArgs(Integer processIdx,
+                                                          Integer batchIdx,
+                                                          List<Integer> stitchedImagePageIndices,
+                                                          Path outputDir,
+                                                          String documentAbsolutePath) {
+
+        String imagePathFormat = outputDir.resolve("output_" + processIdx + "_" + batchIdx + ".%04d" + FORMAT).toFile().toString();
+
+        Map<Integer, RenderedPageImageFile> fullPageImages = new HashMap<>();
+        for (int i = 0; i < stitchedImagePageIndices.size(); i++) {
+            Integer pageNumber = stitchedImagePageIndices.get(i);
+            fullPageImages.put(pageNumber, new RenderedPageImageFile(pageNumber, String.format(imagePathFormat, i + 1)));
+        }
+
+        String[] cmdArgs = buildCmdArgs(stitchedImagePageIndices, documentAbsolutePath, imagePathFormat);
+
+        return new ProcessCmdsAndRenderedImageFiles(cmdArgs, fullPageImages);
+    }
+
+
+    private String[] buildCmdArgs(List<Integer> stitchedImagePageIndices, String documentAbsolutePath, String imagePathFormat) {
+
+        StringBuilder sPageList = new StringBuilder();
+        int i = 1;
+        for (Integer integer : stitchedImagePageIndices) {
+            sPageList.append(integer);
+            if (i < stitchedImagePageIndices.size()) {
+                sPageList.append(",");
+            }
+            i++;
+        }
+
+        String[] cmdArgs = new String[]{"gs", "-dNOPAUSE", "-sDEVICE=" + DEVICE, "-r" + settings.getDpi(), "-sPageList=" + sPageList, "-sOutputFile=" + imagePathFormat, documentAbsolutePath, "-c", "quit"};
+        return cmdArgs;
+    }
+
+
+    @SneakyThrows
+    private Process executeProcess(ProcessCmdsAndRenderedImageFiles processInfo, BlockingQueue<RenderedPageImageFile> imageFileCollectorQueue) {
+
+        Process p = Runtime.getRuntime().exec(processInfo.cmdArgs());
+        InputStream stdOut = p.getInputStream();
+        GhostScriptOutputHandler stdOutLogger = GhostScriptOutputHandler.stdOut(stdOut, processInfo.renderedPageImageFiles(), imageFileCollectorQueue);
+        InputStream stdError = p.getErrorStream();
+        GhostScriptOutputHandler stdErrorLogger = GhostScriptOutputHandler.errorHandler(stdError);
+
+        stdOutLogger.start();
+        stdErrorLogger.start();
+        return p;
+    }
+
+
+    private record ProcessCmdsAndRenderedImageFiles(String[] cmdArgs, Map<Integer, RenderedPageImageFile> renderedPageImageFiles) {
+
+    }
+
+    private record ProcessInfo(Integer processIdx, List<Integer> stitchedPageNumbers) {
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/HOcrPageParser.java

@@ -0,0 +1,24 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.FileInputStream;
+import java.util.List;
+
+import io.github.karols.hocr4j.Page;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class HOcrPageParser {
+
+    @SneakyThrows
+    public Page extractHocrPage(String tesseractOutputFileName) {
+
+        String hOcrString;
+        try (var hocrIn = new FileInputStream(tesseractOutputFileName + ".hocr")) {
+            hOcrString = new String(hocrIn.readAllBytes());
+        }
+        return Page.fromHocr(List.of(hOcrString)).get(0);
+    }
+
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/IOcrMessageSender.java

@@ -0,0 +1,13 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public interface IOcrMessageSender {
+
+    void sendUpdate(String fileId, int finishedImages, int totalImages);
+
+
+    void sendOcrFinished(String fileId, int totalImages);
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/ImageStreamEngine.java

@@ -0,0 +1,96 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
+import org.apache.pdfbox.contentstream.operator.DrawObject;
+import org.apache.pdfbox.contentstream.operator.Operator;
+import org.apache.pdfbox.contentstream.operator.state.Concatenate;
+import org.apache.pdfbox.contentstream.operator.state.Restore;
+import org.apache.pdfbox.contentstream.operator.state.Save;
+import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
+import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.graphics.PDXObject;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.util.Matrix;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedImage;
+import com.knecon.fforesight.service.ocr.processor.model.QuadPoint;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+
+import lombok.Getter;
+import lombok.SneakyThrows;
+
+@Getter
+public class ImageStreamEngine extends PDFStreamEngine {
+
+    private List<ExtractedImage> imagesOnCurrentPage;
+    private OcrServiceSettings settings;
+    private int pageNum;
+
+
+    public ImageStreamEngine(OcrServiceSettings settings) {
+
+        this.settings = settings;
+        // preparing PDFStreamEngine
+        addOperator(new Concatenate(this));
+        addOperator(new DrawObject(this));
+        addOperator(new SetGraphicsStateParameters(this));
+        addOperator(new Save(this));
+        addOperator(new Restore(this));
+        addOperator(new SetMatrix(this));
+    }
+
+
+    @Override
+    protected void processOperator(Operator operator, List<COSBase> operands) throws IOException {
+
+        String operation = operator.getName();
+        if ("Do".equals(operation)) {
+            COSName objectName = (COSName) operands.get(0);
+            // get the PDF object
+            PDXObject xobject = getResources().getXObject(objectName);
+
+            // check if the object is an image object
+            if (xobject instanceof PDImageXObject imageXObject) {
+
+                if (imageXObject.getWidth() < settings.getMinImageWidth() || imageXObject.getHeight() < settings.getMinImageHeight()) {
+                    return;
+                }
+
+                Matrix imageCTM = getGraphicsState().getCurrentTransformationMatrix();
+                this.imagesOnCurrentPage.add(new ExtractedImage(pageNum,
+                    QuadPoint.fromRectangle2D(new Rectangle2D.Double(0, 0, imageXObject.getWidth(), imageXObject.getHeight())),
+                        imageXObject.getHeight(),
+                        imageXObject.getWidth(),
+                        imageXObject.getImage(),
+                        imageCTM,
+                        imagesOnCurrentPage.size(),
+                        imageXObject.getColorSpace()));
+
+            } else if (xobject instanceof PDFormXObject) {
+                PDFormXObject form = (PDFormXObject) xobject;
+                showForm(form);
+            }
+        } else {
+            super.processOperator(operator, operands);
+        }
+    }
+
+
+    @SneakyThrows
+    public void processPage(int pageNum, PDPage page) {
+
+        this.pageNum = pageNum;
+        this.imagesOnCurrentPage = new LinkedList<>();
+        super.processPage(page);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/OCRService.java

@@ -0,0 +1,152 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.stream.IntStream;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.stereotype.Service;
+import org.springframework.util.FileSystemUtils;
+
+import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
+import com.iqser.red.pdftronlogic.commons.WatermarkRemovalService;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.OcrResult;
+import com.knecon.fforesight.service.ocr.processor.service.threads.OCRThread;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class OCRService {
+
+    FileStorageService fileStorageService;
+    OcrServiceSettings settings;
+    IOcrMessageSender ocrMessageSender;
+    WatermarkRemovalService watermarkRemovalService;
+    InvisibleElementRemovalService invisibleElementRemovalService;
+    OcrResultWriter ocrResultWriter;
+    GhostScriptService ghostScriptService;
+
+
+    /**
+     * Starts the OCR-Process: Collecting images (via threads),
+     * looking for stitchedImages (if so converting the current page to an image with ghostscript and work on this instead),
+     * perform tesseract-ocr on these images (via threads) and write the generated ocr-text as invisible elements.
+     *
+     * @param dossierId Id of dossier
+     * @param fileId    Id of file
+     * @param out       OutputStream where to write to
+     */
+    @SneakyThrows
+    public void runOcrOnDocument(String dossierId, String fileId, OutputStream out) {
+
+        try (InputStream fileStream = removeWatermarkIfEnabled(dossierId, fileId); ByteArrayOutputStream transferOutputStream = new ByteArrayOutputStream()) {
+
+            invisibleElementRemovalService.removeInvisibleElements(fileStream, transferOutputStream, false);
+
+            try (InputStream transferInputStream = new ByteArrayInputStream(transferOutputStream.toByteArray())) {
+                log.info("Starting OCR for file {}", fileId);
+                long ocrStart = System.currentTimeMillis();
+                Statistics stats = runOcr(transferInputStream, out, fileId, dossierId);
+                long ocrEnd = System.currentTimeMillis();
+                log.info("ocr successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, String.format("%.1f", (ocrEnd - ocrStart) / 1000.0));
+                log.info("Runtime breakdown: {}", stats);
+            }
+        }
+    }
+
+
+    private InputStream removeWatermarkIfEnabled(String dossierId, String fileId) throws IOException {
+
+        if (settings.isRemoveWatermark()) {
+            try (var in = fileStorageService.getOriginalFileAsStream(dossierId, fileId); var transferOutputStream = new ByteArrayOutputStream()) {
+                watermarkRemovalService.removeWatermarks(in, transferOutputStream);
+                return new ByteArrayInputStream(transferOutputStream.toByteArray());
+            }
+        }
+        return fileStorageService.getOriginalFileAsStream(dossierId, fileId);
+    }
+
+
+    @SneakyThrows
+    public Statistics runOcr(InputStream in, OutputStream out, String fileId, String dossierId) {
+
+        long timestamp;
+        Path tmpDir = Path.of(OsUtils.getTemporaryDirectory()).resolve(dossierId + "-" + fileId);
+        Path tmpImageDir = tmpDir.resolve("images");
+        Path tesseractOutputDir = tmpDir.resolve("tesseract_output");
+
+        tesseractOutputDir.toFile().mkdirs();
+        tmpImageDir.toFile().mkdirs();
+
+        File documentFile = OsUtils.writeFileToTmpFolder(in, tmpDir);
+
+        Statistics stats;
+        try (PDDocument document = Loader.loadPDF(documentFile)) {
+            OcrProgressLogger logger = new OcrProgressLogger(document.getNumberOfPages(), ocrMessageSender, fileId);
+
+            int numberOfExtractThreads = Math.min(settings.getImageExtractThreadCount(), document.getNumberOfPages());
+            int numberOfOcrThreads = Math.min(settings.getOcrThreadCount(), document.getNumberOfPages());
+            stats = new Statistics(numberOfExtractThreads, numberOfOcrThreads);
+
+            BlockingQueue<OcrImage> ocrImageQueue = new ArrayBlockingQueue<>((int) (1.5 * numberOfOcrThreads));
+
+            OcrImageFactory ocrImageFactory = new OcrImageFactory(document,
+                    documentFile,
+                    tmpImageDir,
+                    numberOfExtractThreads,
+                    ghostScriptService,
+                    ocrImageQueue,
+                    logger,
+                    settings,
+                    stats);
+            ocrImageFactory.start();
+
+            List<OcrResult> ocrResults = new LinkedList<>();
+            List<OCRThread> ocrThreads = IntStream.range(0, numberOfOcrThreads)
+                    .boxed()
+                    .map(id -> new OCRThread(id, ocrImageQueue, tesseractOutputDir, ocrResults, logger, stats, settings))
+                    .peek(Thread::start)
+                    .toList();
+            log.info("Started {} OCR consumer threads, listening for images on the queue", ocrThreads.size());
+            ocrImageFactory.join();
+            log.info("Processed all images, interrupting ocr threads");
+
+            ocrThreads.forEach(Thread::interrupt);
+            for (OCRThread ocrThread : ocrThreads) {
+                ocrThread.join();
+            }
+
+            log.info("OCR processing has finished, writing results");
+            timestamp = System.currentTimeMillis();
+            var dictionariesToUpdate = ocrResultWriter.drawOcrResultsToPdf(document, ocrResults);
+            log.info("Saving document");
+            document.saveIncremental(out, dictionariesToUpdate);
+            stats.increaseWritingTextDuration(System.currentTimeMillis() - timestamp);
+
+            FileSystemUtils.deleteRecursively(tmpDir);
+            logger.sendFinished();
+            return stats;
+        }
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/OcrImageFactory.java

@@ -0,0 +1,104 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedImage;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.UnprocessedImage;
+import com.knecon.fforesight.service.ocr.processor.service.threads.ImageExtractionThread;
+import com.knecon.fforesight.service.ocr.processor.service.threads.ImageProcessingThread;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+import com.knecon.fforesight.service.ocr.processor.utils.ListSplittingUtils;
+
+import lombok.AccessLevel;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class OcrImageFactory {
+
+    PDDocument document;
+    File documentFile;
+    Path tmpImageDir;
+    GhostScriptService ghostScriptService;
+    BlockingQueue<UnprocessedImage> imageProcessingQueue;
+    ImageProcessingThread imageProcessingThread;
+    BlockingQueue<OcrImage> imageOutputQueue;
+    List<ImageExtractionThread> imageExtractionThreads;
+    List<Integer> stitchedPageNumbers;
+    Statistics stats;
+
+
+    public OcrImageFactory(PDDocument document,
+                           File documentFile,
+                           Path tmpImageDir,
+                           int numberOfThreads,
+                           GhostScriptService ghostScriptService,
+                           BlockingQueue<OcrImage> imageOcrQueue,
+                           OcrProgressLogger logger,
+                           OcrServiceSettings settings,
+                           Statistics stats) {
+
+        this.document = document;
+        this.documentFile = documentFile;
+        this.tmpImageDir = tmpImageDir;
+        this.ghostScriptService = ghostScriptService;
+        this.imageOutputQueue = imageOcrQueue;
+        this.imageProcessingQueue = new ArrayBlockingQueue<>(imageOcrQueue.remainingCapacity());
+        this.stitchedPageNumbers = Collections.synchronizedList(new LinkedList<>());
+        this.stats = stats;
+
+        this.imageExtractionThreads = new ArrayList<>(numberOfThreads);
+
+        List<List<Integer>> balancedPageNumbers = ListSplittingUtils.buildBalancedContinuousSublist(document.getNumberOfPages(), numberOfThreads);
+        for (int i = 0; i < balancedPageNumbers.size(); i++) {
+            imageExtractionThreads.add(new ImageExtractionThread(i, balancedPageNumbers.get(i), documentFile, logger, stats, settings, imageProcessingQueue, stitchedPageNumbers));
+        }
+        this.imageProcessingThread = new ImageProcessingThread(imageProcessingQueue, imageOcrQueue, stats, settings, document);
+
+        log.info("Started {} image extraction threads, with ({}) pages each",
+                imageExtractionThreads.size(),
+                imageExtractionThreads.stream().map(ImageExtractionThread::getPageIndices).map(List::size).map(String::valueOf).collect(Collectors.joining(", ")));
+    }
+
+
+    public void start() {
+
+        for (ImageExtractionThread imageExtractionThread : imageExtractionThreads) {
+            imageExtractionThread.start();
+        }
+        imageProcessingThread.start();
+
+    }
+
+
+    @SneakyThrows
+    public void join() {
+
+        for (ImageExtractionThread imageExtractionThread : imageExtractionThreads) {
+            imageExtractionThread.join();
+        }
+
+        if (!stitchedPageNumbers.isEmpty()) {
+            ghostScriptService.renderPagesAsImagesBatchedAndAddToQueue(stitchedPageNumbers, documentFile.toString(), tmpImageDir, document, imageProcessingQueue, stats);
+        }
+        imageProcessingThread.interrupt();
+        log.info("All images extracted, interrupting processing thread.");
+
+        imageProcessingThread.join();
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/OcrProgressLogger.java

@@ -0,0 +1,91 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedOcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class OcrProgressLogger {
+
+    Set<ImageNumberWithPageNumber> imagesToProcess;
+    Set<ImageNumberWithPageNumber> processedImages;
+    IOcrMessageSender ocrMessageSender;
+
+    String fileId;
+
+
+    public OcrProgressLogger(int totalPageCount, IOcrMessageSender ocrMessageSender, String fileId) {
+
+        this.ocrMessageSender = ocrMessageSender;
+        this.fileId = fileId;
+        this.imagesToProcess = Collections.synchronizedSet(new HashSet<>(totalPageCount));
+        for (int i = 0; i < totalPageCount; i++) {
+            imagesToProcess.add(new ImageNumberWithPageNumber(0, i + 1));
+        }
+        this.processedImages = Collections.synchronizedSet(new HashSet<>(totalPageCount));
+    }
+
+
+    public void logImageFinished(OcrImage image, int psm) {
+
+        this.processedImages.add(new ImageNumberWithPageNumber(image.getNumberOnPage(), image.getPageNumber()));
+
+        if (image instanceof ExtractedOcrImage) {
+            log.info("{}/{}: Finished image {} on page {} with rotation {}, used PSM {}, quad-point: {}",
+                    processedImages.size(),
+                    imagesToProcess.size(),
+                    image.getNumberOnPage(),
+                    image.getPageNumber(),
+                    image.getRotationDegrees(),
+                    psm,
+                    image.getImageCoordinatesInInitialUserSpace());
+        } else {
+            log.info("{}/{}: Finished page {} as fully rendered page with rotation {}, used PSM {}",
+                    processedImages.size(),
+                    imagesToProcess.size(),
+                    image.getPageNumber(),
+                    image.getRotationDegrees(),
+                    psm);
+
+        }
+        ocrMessageSender.sendUpdate(fileId, this.processedImages.size(), this.imagesToProcess.size());
+    }
+
+
+    public void logPageSkipped(Integer pageIndex) {
+
+        var pageDummy = new ImageNumberWithPageNumber(0, pageIndex);
+        this.imagesToProcess.remove(pageDummy);
+        log.debug("{}/{}: No images to ocr on page {}", processedImages.size(), imagesToProcess.size(), pageIndex);
+        ocrMessageSender.sendUpdate(fileId, this.processedImages.size(), imagesToProcess.size());
+    }
+
+
+    public void addImagesToProcess(int pageNumber, int imageNumber) {
+
+        this.imagesToProcess.add(new ImageNumberWithPageNumber(imageNumber, pageNumber));
+    }
+
+
+    public void sendFinished() {
+
+        log.info("{}/{}: Finished OCR on all images", processedImages.size(), imagesToProcess.size());
+        ocrMessageSender.sendOcrFinished(fileId, imagesToProcess.size());
+    }
+
+
+    private record ImageNumberWithPageNumber(int imageNumber, int pageNumber) {
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/OcrResultWriter.java

@@ -0,0 +1,259 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.awt.Color;
+import java.awt.geom.Point2D;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
+import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.apache.pdfbox.pdmodel.graphics.state.RenderingMode;
+import org.springframework.stereotype.Service;
+
+import com.knecon.fforesight.service.ocr.processor.model.OcrResult;
+import com.knecon.fforesight.service.ocr.processor.model.QuadPoint;
+import com.knecon.fforesight.service.ocr.processor.model.TextPositionInImage;
+import com.knecon.fforesight.service.ocr.processor.service.fonts.FontMetricsFactory;
+import com.knecon.fforesight.service.ocr.processor.service.fonts.Type0FontMetricsFactory;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class OcrResultWriter {
+
+    static String ocrLayerName = "knecon OCR";
+    OcrServiceSettings settings;
+
+
+    @SneakyThrows
+    public Set<COSDictionary> drawOcrResultsToPdf(PDDocument document, List<OcrResult> ocrResults) {
+
+        FontMetricsFactory fontMetricsFactory = new Type0FontMetricsFactory(document);
+        Set<COSDictionary> dictionariesToUpdate = new HashSet<>();
+        Map<Integer, List<OcrResult>> resultsPerPage = ocrResults.stream().collect(Collectors.groupingBy(result -> result.image().pageNumber()));
+        resultsPerPage.keySet().forEach(pageNumber -> drawResultsPerPage(document, pageNumber, resultsPerPage, dictionariesToUpdate, fontMetricsFactory));
+        dictionariesToUpdate.add(document.getDocumentInformation().getCOSObject());
+        return dictionariesToUpdate;
+    }
+
+
+    @SneakyThrows
+    private void drawResultsPerPage(PDDocument document, Integer pageNumber, Map<Integer, List<OcrResult>> resultsPerPage, Set<COSDictionary> dictionariesToUpdate, FontMetricsFactory fontMetricsFactory) {
+
+        var pdPage = document.getPage(pageNumber - 1);
+
+        PDOptionalContentGroup textDebugLayer = new PDOptionalContentGroup(ocrLayerName);
+        PDOptionalContentGroup bBoxDebugLayer = new PDOptionalContentGroup(ocrLayerName + "BBox");
+        if (settings.isDebug()) {
+            textDebugLayer = addOptionalGroup(ocrLayerName, document, pdPage, dictionariesToUpdate);
+            bBoxDebugLayer = addOptionalGroup(ocrLayerName + " BBox", document, pdPage, dictionariesToUpdate);
+        }
+
+        escapeContentStreams(document, pdPage);
+
+        List<TextPositionInImage> words = buildTextPositionsOnPage(pageNumber, resultsPerPage, fontMetricsFactory);
+        try (var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true)) {
+
+            // write invisible ocr text inside tagged content
+            contentStream.beginMarkedContent(settings.getOcrMarkedContentTag());
+            contentStream.saveGraphicsState();
+            contentStream.setNonStrokingColor(Color.BLUE);
+            contentStream.setStrokingColor(Color.BLUE);
+            contentStream.setLineWidth(1);
+            words.forEach(word -> drawInvisibleWord(word, contentStream));
+            contentStream.restoreGraphicsState();
+            contentStream.endMarkedContent();
+
+            if (settings.isDebug()) { // must not be written, as it will interfere with layout parsing
+                // write visible ocr text inside optional group
+                contentStream.beginMarkedContent(COSName.OC, textDebugLayer);
+                contentStream.saveGraphicsState();
+                contentStream.setNonStrokingColor(Color.BLUE);
+                words.forEach(word -> drawVisibleWord(word, contentStream));
+                contentStream.restoreGraphicsState();
+                contentStream.endMarkedContent();
+
+                // write word bounding boxes (tesseract output) inside optional group
+                contentStream.beginMarkedContent(COSName.OC, bBoxDebugLayer);
+                contentStream.saveGraphicsState();
+                resultsPerPage.get(pageNumber).stream().map(OcrResult::image).forEach(image -> drawGrid(contentStream, image.position()));
+                words.stream().map(TextPositionInImage::getTransformedTextBBox).forEach(word -> drawRectangle(contentStream, word));
+                contentStream.restoreGraphicsState();
+                contentStream.endMarkedContent();
+            }
+        }
+        dictionariesToUpdate.add(pdPage.getCOSObject());
+        dictionariesToUpdate.add(pdPage.getResources().getCOSObject());
+    }
+
+
+    private static List<TextPositionInImage> buildTextPositionsOnPage(Integer pageNumber, Map<Integer, List<OcrResult>> resultsPerPage, FontMetricsFactory fontMetricsFactory) {
+
+        return resultsPerPage.get(pageNumber)
+                .stream()
+                .flatMap(result -> result.getAllWords().stream().filter(word -> !word.isBlank()).map(word -> new TextPositionInImage(word, result.image().ctm(), fontMetricsFactory)))
+                .toList();
+    }
+
+
+    @SneakyThrows
+    private static void escapeContentStreams(PDDocument document, PDPage pdPage) {
+        // We need to append to the contentstream, otherwise the content could be overlapped by images
+        // But we also need to save the graphics state before, such that our appended content cannot be affected by previous contentstreams with side-effects, such as not escaped matrix transformations
+        try (var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.PREPEND, false)) {
+            contentStream.saveGraphicsState();
+        }
+        try (var contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, false)) {
+            contentStream.restoreGraphicsState();
+        }
+    }
+
+
+    private PDOptionalContentGroup addOptionalGroup(String ocrLayerName, PDDocument document, PDPage pdPage, Set<COSDictionary> dictionariesToUpdate) {
+
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
+        PDOptionalContentProperties ocprops = catalog.getOCProperties();
+        if (ocprops == null) {
+            ocprops = new PDOptionalContentProperties();
+            catalog.setOCProperties(ocprops);
+        }
+        PDOptionalContentGroup layer = null;
+        if (ocprops.hasGroup(ocrLayerName)) {
+            layer = ocprops.getGroup(ocrLayerName);
+        } else {
+            layer = new PDOptionalContentGroup(ocrLayerName);
+            ocprops.addGroup(layer);
+        }
+
+        // enable debug layers by default only when DEBUG flag is set.
+        ocprops.setGroupEnabled(layer, settings.isDebug());
+        PDResources resources = pdPage.getResources();
+        if (resources == null) {
+            resources = new PDResources();
+            pdPage.setResources(resources);
+        }
+        dictionariesToUpdate.add(catalog.getCOSObject());
+        return layer;
+    }
+
+
+    @SneakyThrows
+    private void drawRectangle(PDPageContentStream contentStream, QuadPoint rect) {
+
+        contentStream.saveGraphicsState();
+        contentStream.setLineWidth(1);
+        contentStream.moveTo((float) rect.a().getX(), (float) rect.a().getY());
+        contentStream.lineTo((float) rect.b().getX(), (float) rect.b().getY());
+        contentStream.setStrokingColor(Color.ORANGE);
+        contentStream.stroke();
+        contentStream.moveTo((float) rect.b().getX(), (float) rect.b().getY());
+        contentStream.lineTo((float) rect.c().getX(), (float) rect.c().getY());
+        contentStream.setStrokingColor(Color.BLUE);
+        contentStream.stroke();
+        contentStream.moveTo((float) rect.c().getX(), (float) rect.c().getY());
+        contentStream.lineTo((float) rect.d().getX(), (float) rect.d().getY());
+        contentStream.setStrokingColor(Color.GREEN);
+        contentStream.stroke();
+        contentStream.moveTo((float) rect.d().getX(), (float) rect.d().getY());
+        contentStream.lineTo((float) rect.a().getX(), (float) rect.a().getY());
+        contentStream.setStrokingColor(Color.MAGENTA);
+        contentStream.stroke();
+        contentStream.restoreGraphicsState();
+    }
+
+
+    private void drawInvisibleWord(TextPositionInImage word, PDPageContentStream contentStream) {
+
+        drawWord(word, contentStream, RenderingMode.NEITHER);
+    }
+
+
+    private void drawVisibleWord(TextPositionInImage word, PDPageContentStream contentStream) {
+
+        drawWord(word, contentStream, RenderingMode.FILL);
+    }
+
+
+    //    @SneakyThrows
+    private void drawWord(TextPositionInImage position, PDPageContentStream contentStream, RenderingMode renderingMode) {
+
+        try {
+            contentStream.beginText();
+            contentStream.setRenderingMode(renderingMode);
+            contentStream.setFont(position.getFont(), (float) position.getFontSize());
+            contentStream.setTextMatrix(position.getTextMatrix());
+            contentStream.showText(position.getText());
+            contentStream.endText();
+
+        } catch (Exception e) {
+            log.error("Failed to write text {}", position.getText());
+            log.error(e.getMessage());
+        }
+    }
+
+
+    @SneakyThrows
+    private void drawGrid(PDPageContentStream contentStream, QuadPoint rect) {
+
+        drawRectangle(contentStream, rect);
+
+        contentStream.saveGraphicsState();
+        contentStream.setStrokingColor(Color.BLACK);
+        contentStream.setLineWidth(0.2F);
+        int nRows = 8;
+        int nCols = 8;
+
+        Point2D abStep = new Point2D.Double((rect.b().getX() - rect.a().getX()) / (nRows + 1), (rect.b().getY() - rect.a().getY()) / (nRows + 1));
+        Point2D start = add(rect.a(), abStep);
+        Point2D end = add(rect.d(), abStep);
+        for (int row = 0; row < nRows; ++row) {
+            drawLine(start, end, contentStream);
+            start = add(start, abStep);
+            end = add(end, abStep);
+        }
+        Point2D adStep = new Point2D.Double((rect.d().getX() - rect.a().getX()) / (nCols + 1), (rect.d().getY() - rect.a().getY()) / (nCols + 1));
+        start = add(rect.a(), adStep);
+        end = add(rect.b(), adStep);
+        for (int col = 0; col < nCols; ++col) {
+            drawLine(start, end, contentStream);
+            start = add(start, adStep);
+            end = add(end, adStep);
+        }
+        contentStream.restoreGraphicsState();
+
+    }
+
+
+    @SneakyThrows
+    private void drawLine(Point2D a, Point2D b, PDPageContentStream contentStream) {
+
+        contentStream.moveTo((float) a.getX(), (float) a.getY());
+        contentStream.lineTo((float) b.getX(), (float) b.getY());
+        contentStream.stroke();
+    }
+
+
+    private Point2D add(Point2D a, Point2D b) {
+
+        return new Point2D.Double(a.getX() + b.getX(), a.getY() + b.getY());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/OsUtils.java

@@ -1,4 +1,10 @@
-package com.iqser.red.service.ocr.v1.server.utils;
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -21,6 +27,14 @@ public final class OsUtils {
         return addBackSlashAtEnd(getTemporaryDirectory()) + addBackSlashAtEnd(SERVICE_NAME) + addBackSlashAtEnd(suffix) + addBackSlashAtEnd(fileId);
     }
 
+    public static File writeFileToTmpFolder(InputStream in, Path tmpDir) throws IOException {
+
+        File pdfFile = tmpDir.resolve("document.pdf").toFile();
+        try (var fileOut = new FileOutputStream(pdfFile)) {
+            fileOut.write(in.readAllBytes());
+        }
+        return pdfFile;
+    }
 
     private static boolean isWindows() {
 
@@ -55,4 +69,10 @@ public final class OsUtils {
         return "/tmp";
     }
 
+
+    public static String createTmpFileName(String filename, String suffix) {
+
+        return Path.of(OsUtils.getTemporaryDirectory()).resolve(Path.of(filename).getFileName()).toString().replace(".pdf", "_" + suffix + ".pdf");
+    }
+
 }

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/Statistics.java

@@ -0,0 +1,77 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class Statistics {
+
+    List<Long> imageExtraction;
+    List<Long> tesseractDuration;
+    AtomicLong pdf2ImgDuration;
+    AtomicLong writingTextDuration;
+    AtomicLong imageProcessingDuration;
+
+
+    public Statistics(int numberOfExtractThreads, int numberOfOcrThreads) {
+
+        this.imageExtraction = Collections.synchronizedList(new ArrayList<>(Collections.nCopies(numberOfExtractThreads, 0L)));
+        this.tesseractDuration = Collections.synchronizedList(new ArrayList<>(Collections.nCopies(numberOfOcrThreads, 0L)));
+        this.pdf2ImgDuration = new AtomicLong(0);
+        this.writingTextDuration = new AtomicLong(0);
+        this.imageProcessingDuration = new AtomicLong(0);
+    }
+
+
+    public void increaseImageExtraction(int threadId, long duration) {
+
+        imageExtraction.set(threadId, imageExtraction.get(threadId) + duration);
+    }
+
+
+    public void increaseImageProcessing(long duration) {
+
+        imageProcessingDuration.addAndGet(duration);
+    }
+
+
+    public void increaseTesseractDuration(int threadId, long duration) {
+
+        tesseractDuration.set(threadId, tesseractDuration.get(threadId) + duration);
+    }
+
+
+    public void increasePDF2ImgDuration(long duration) {
+
+        pdf2ImgDuration.addAndGet(duration);
+    }
+
+
+    public void increaseWritingTextDuration(long duration) {
+
+        writingTextDuration.addAndGet(duration);
+    }
+
+
+    @Override
+    public String toString() {
+
+        return String.format(
+                "imageExtraction: mean %.2f s, max %.2f s, min %.2f, tesseract: mean %.2f s, max %.2f s, min %.2f, ImageProcessing=%.2f s, PDF2Img=%.2f s, writingText=%.2f s",
+                ((float) imageExtraction.stream().mapToLong(Long::longValue).average().orElse(0) / 1000),
+                ((float) imageExtraction.stream().mapToLong(Long::longValue).max().orElse(0) / 1000),
+                ((float) imageExtraction.stream().mapToLong(Long::longValue).min().orElse(0) / 1000),
+                ((float) tesseractDuration.stream().mapToLong(Long::longValue).average().orElse(0) / 1000),
+                ((float) tesseractDuration.stream().mapToLong(Long::longValue).max().orElse(0) / 1000),
+                ((float) tesseractDuration.stream().mapToLong(Long::longValue).min().orElse(0) / 1000),
+                (float) imageProcessingDuration.get() / 1000,
+                (float) pdf2ImgDuration.get() / 1000,
+                (float) writingTextDuration.get() / 1000);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/fonts/FontMetricsFactory.java

@@ -0,0 +1,41 @@
+package com.knecon.fforesight.service.ocr.processor.service.fonts;
+
+import org.apache.pdfbox.pdmodel.font.PDFont;
+
+import com.knecon.fforesight.service.ocr.processor.model.FontMetrics;
+import com.knecon.fforesight.service.ocr.processor.model.HeightAndDescent;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+public interface FontMetricsFactory {
+
+    default FontMetrics calculateMetrics(String text, double textWidth, double textHeight) {
+
+        HeightAndDescent heightAndDescent = calculateHeightAndDescent(text);
+        float fontSize = calculateFontSize(text, textWidth);
+        float heightScaling = (float) ((textHeight / (heightAndDescent.height() - heightAndDescent.descent())) * 1000) / fontSize;
+
+        return new FontMetrics((heightAndDescent.descent() / 1000) * fontSize, fontSize, heightScaling);
+    }
+
+
+    @SneakyThrows
+    default float calculateFontSize(String text, double textWidth) {
+
+        float width;
+        try {
+            width = getFont().getStringWidth(text);
+        } catch (IllegalArgumentException e) {
+            // this means, the font has no glyph for this character
+            width = getFont().getAverageFontWidth() * text.length();
+        }
+        return (float) (textWidth / width) * 1000;
+    }
+
+
+    PDFont getFont();
+
+    HeightAndDescent calculateHeightAndDescent(String text);
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/fonts/Type0FontMetricsFactory.java

@@ -0,0 +1,77 @@
+package com.knecon.fforesight.service.ocr.processor.service.fonts;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.fontbox.ttf.GlyphData;
+import org.apache.fontbox.ttf.TTFParser;
+import org.apache.fontbox.ttf.TrueTypeFont;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+
+import com.knecon.fforesight.service.ocr.processor.model.HeightAndDescent;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class Type0FontMetricsFactory implements FontMetricsFactory {
+
+    private final PDType0Font type0Font;
+    private final TrueTypeFont trueTypeFont;
+
+
+    @SneakyThrows
+    public Type0FontMetricsFactory(PDDocument document) {
+
+        try (var in = Thread.currentThread().getContextClassLoader().getResourceAsStream("fonts/cmu-regular.ttf"); var buffer = new RandomAccessReadBuffer(in)) {
+            this.trueTypeFont = new TTFParser().parse(buffer); // since Type0Font can be descendant from any font, we need to remember the original TrueTypeFont for the glyph information
+            this.type0Font = PDType0Font.load(document, this.trueTypeFont, false); // use Type0Font for unicode support
+        }
+    }
+
+
+    @SneakyThrows
+    public HeightAndDescent calculateHeightAndDescent(String text) {
+
+        byte[] bytes;
+        try {
+            bytes = type0Font.encode(text);
+        } catch (IllegalArgumentException e) {
+            log.warn("The string {} could not be parsed, using average height and descent", text);
+            return new HeightAndDescent(800, -50);
+        }
+
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+
+        float descent = 0;
+        float height = 0;
+        while (in.available() > 0) {
+            try {
+                int code = type0Font.readCode(in);
+                int glyphId = type0Font.codeToGID(code);
+                GlyphData glyph = trueTypeFont.getGlyph().getGlyph(glyphId);
+                if (glyph == null || glyph.getBoundingBox() == null) {
+                    continue;
+                }
+
+                descent = Math.min(descent, glyph.getYMinimum());
+                height = Math.max(height, glyph.getYMaximum());
+            } catch (Exception e) {
+                log.warn("descent and height of string {} could not be parsed, using average fallback value!", text);
+            }
+        }
+        // some characters like comma or minus return very small height values, while tesseract still returns a normal-sized bounding box and therefore exploding the height scaling factors,
+        // so we need a minimum value. Here, 500 seems optimal for the characters "-", ",", "_"
+        return new HeightAndDescent(Math.max(height, 500), descent);
+    }
+
+
+    @Override
+    public PDFont getFont() {
+
+        return type0Font;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/BlockingQueueFiller.java

@@ -0,0 +1,61 @@
+package com.knecon.fforesight.service.ocr.processor.service.threads;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageImageFile;
+import com.knecon.fforesight.service.ocr.processor.model.UnprocessedImage;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.tess4j.TessAPI1;
+
+
+/*
+This just moves the Elements from the GhostScriptOutputListener into the ImageProcessing queue asynchronously
+ */
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class BlockingQueueFiller extends Thread {
+
+    BlockingQueue<RenderedPageImageFile> imageInputQueue;
+    BlockingQueue<UnprocessedImage> imageOutputQueue;
+
+    @SneakyThrows
+    @Override
+    public void run() {
+
+        // Interrupting signals that the image extraction has finished
+        while (true) {
+            try {
+                final UnprocessedImage image = imageInputQueue.take();
+                try {
+                    imageOutputQueue.put(image);
+                } catch (InterruptedException e) {
+                    imageOutputQueue.put(image);
+                    break;
+                }
+
+            } catch (InterruptedException e) {
+                break;
+            }
+        }
+        // empty the queue
+        List<UnprocessedImage> remainingImages = new ArrayList<>(imageInputQueue.size());
+        imageInputQueue.drainTo(remainingImages);
+        remainingImages.forEach(image -> {
+            try {
+                imageOutputQueue.put(image);
+            } catch (InterruptedException e) {
+                log.error(e.getMessage());
+            }
+        });
+
+    }
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/GhostScriptOutputHandler.java

@@ -0,0 +1,122 @@
+package com.knecon.fforesight.service.ocr.processor.service.threads;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageImageFile;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class GhostScriptOutputHandler extends Thread {
+
+    static Pattern pageFinishedPattern = Pattern.compile("Page (\\d+)");
+
+    // If the stdError or stdOut buffer of a thread is not being emptied it might lock the process in case of errors, so we need to empty both streams to prevent a deadlock.
+    // Since both need to read simultaneously we need to implement the readers as separate threads.
+
+    final InputStream is;
+    final String processName;
+    final Type type;
+
+    final Map<Integer, RenderedPageImageFile> pagesToProcess;
+    final BlockingQueue<RenderedPageImageFile> renderedPageImageFileOutput;
+
+    int currentPageNumber;
+
+
+    public static GhostScriptOutputHandler errorHandler(InputStream is) {
+
+        return new GhostScriptOutputHandler(is, "GS", Type.ERROR, null, null);
+    }
+
+
+    public static GhostScriptOutputHandler stdOut(InputStream is,
+                                                  Map<Integer, RenderedPageImageFile> pagesToProcess,
+                                                  BlockingQueue<RenderedPageImageFile> renderedPageImageFileOutput) {
+
+        return new GhostScriptOutputHandler(is, "GS", Type.STD_OUT, pagesToProcess, renderedPageImageFileOutput);
+    }
+
+
+    @SneakyThrows
+    public void run() {
+
+        try (InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr)) {
+
+            String line;
+            while (true) {
+                line = br.readLine();
+
+                if (line == null) {
+                    break;
+                }
+
+                if (type.equals(Type.ERROR)) {
+                    log.error(processName + "_" + type.name() + ">" + line);
+                } else {
+                    log.debug(processName + "_" + type.name() + ">" + line);
+                    addProcessedImageToQueue(line);
+                }
+            }
+        }
+        is.close();
+        if (type.equals(Type.STD_OUT)) {
+            queueFinishedPage(currentPageNumber);
+        }
+
+    }
+
+
+    private void addProcessedImageToQueue(String line) {
+
+        /*
+        Ghostscript prints the pageNumber it is currently working on, so we remember the current page and queue it as soon as the next comes in.
+         */
+        Matcher pageNumberMatcher = pageFinishedPattern.matcher(line);
+        if (pageNumberMatcher.find()) {
+            int pageNumber = Integer.parseInt(pageNumberMatcher.group(1));
+
+            if (currentPageNumber == 0) {
+                currentPageNumber = pageNumber;
+                return;
+            }
+
+            queueFinishedPage(currentPageNumber);
+            currentPageNumber = pageNumber;
+        }
+    }
+
+
+    private void queueFinishedPage(int pageNumber) {
+
+        var imageFile = this.pagesToProcess.get(pageNumber);
+        if (imageFile == null) {
+            throw new IllegalArgumentException(String.format("Page number %d does not exist in this thread. It only has pagenumbers %s", pageNumber, pagesToProcess.keySet()));
+        }
+        assert new File(imageFile.absoluteFilePath()).isFile();
+        renderedPageImageFileOutput.add(imageFile);
+    }
+
+
+    public enum Type {
+        ERROR,
+        STD_OUT
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageExtractionThread.java

@@ -0,0 +1,110 @@
+package com.knecon.fforesight.service.ocr.processor.service.threads;
+
+import java.io.File;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedImage;
+import com.knecon.fforesight.service.ocr.processor.model.UnprocessedImage;
+import com.knecon.fforesight.service.ocr.processor.service.ImageStreamEngine;
+import com.knecon.fforesight.service.ocr.processor.service.OcrProgressLogger;
+import com.knecon.fforesight.service.ocr.processor.service.Statistics;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ImageExtractionThread extends Thread {
+
+    static double FULL_PAGE_IMAGE_THRESHOLD = 0.99;
+    static double IMAGE_ALIGNMENT_THRESHOLD = 1;
+
+    int id;
+    @Getter
+    List<Integer> pageIndices;
+    File documentFile;
+    OcrProgressLogger logger;
+    Statistics stats;
+    OcrServiceSettings settings;
+
+    // output is written to these lists
+    BlockingQueue<UnprocessedImage> imageProcessingQueue;
+    List<Integer> stitchedPageNumbers;
+
+
+    @SneakyThrows
+    @Override
+    public void run() {
+
+        long timestamp;
+        for (Integer pageIndex : pageIndices) {
+            try (PDDocument document = Loader.loadPDF(documentFile)) { // load new PDDocument for thread safety, also keeps RAM usage low.
+                timestamp = System.currentTimeMillis();
+                List<ExtractedImage> extractedImages = getExtractedImages(pageIndex, document);
+                stats.increaseImageExtraction(id, System.currentTimeMillis() - timestamp);
+                if (extractedImages.isEmpty()) {
+                    logger.logPageSkipped(pageIndex);
+                }
+
+                if (checkForFullPageOrStitchedImages(extractedImages, document.getPage(pageIndex - 1))) {
+                    stitchedPageNumbers.add(pageIndex);
+                    logger.addImagesToProcess(pageIndex, 0);
+                    continue;
+                }
+
+                for (ExtractedImage image : extractedImages) {
+                    imageProcessingQueue.put(image);
+                    logger.addImagesToProcess(image.pageNumber(), image.numberOnPage());
+                }
+            }
+        }
+    }
+
+
+    private List<ExtractedImage> getExtractedImages(Integer pageIndex, PDDocument document) {
+
+        PDPage page = document.getPage(pageIndex - 1);
+        ImageStreamEngine imageStreamEngine = new ImageStreamEngine(settings);
+        imageStreamEngine.processPage(pageIndex, page);
+        return imageStreamEngine.getImagesOnCurrentPage();
+    }
+
+
+    @SneakyThrows
+    private boolean checkForFullPageOrStitchedImages(List<ExtractedImage> imagesOnCurrentPage, PDPage page) {
+
+        if (imagesOnCurrentPage.isEmpty()) {
+            return false;
+        }
+
+        for (ExtractedImage imageOnPage : imagesOnCurrentPage) {
+            if (imageOnPage.width() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox().getWidth() && imageOnPage.height() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox()
+                    .getHeight()) {
+                return true;
+            }
+        }
+
+        //checking for intersections or direct alignment of images
+        for (int j = 0; j < imagesOnCurrentPage.size(); j++) {
+            for (int i = j + 1; i < imagesOnCurrentPage.size(); i++) {
+                if (imagesOnCurrentPage.get(j)
+                        .getImageCoordinatesInInitialUserSpace()
+                        .aligns(imagesOnCurrentPage.get(i).getImageCoordinatesInInitialUserSpace(), IMAGE_ALIGNMENT_THRESHOLD)) {
+                    // TODO: see if we can stitch aligning images using BufferedImage and skip the gs conversion entirely
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageProcessingThread.java

@@ -0,0 +1,205 @@
+package com.knecon.fforesight.service.ocr.processor.service.threads;
+
+import static net.sourceforge.tess4j.ITessAPI.TRUE;
+
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedImage;
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedOcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.PageInformation;
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageImageFile;
+import com.knecon.fforesight.service.ocr.processor.model.RenderedPageOcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.UnprocessedImage;
+import com.knecon.fforesight.service.ocr.processor.service.Statistics;
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+import com.knecon.fforesight.service.ocr.processor.utils.ImageProcessingUtils;
+import com.sun.jna.ptr.PointerByReference;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.lept4j.util.LeptUtils;
+import net.sourceforge.tess4j.ITessAPI;
+import net.sourceforge.tess4j.TessAPI1;
+
+/*
+ * This thread does all the image processing. There should only be one, since Leptonica is not thread safe.
+ */
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class ImageProcessingThread extends Thread {
+
+    BlockingQueue<UnprocessedImage> imageInputQueue;
+    BlockingQueue<OcrImage> imageOutputQueue;
+    ITessAPI.TessBaseAPI detectionScriptHandle = initDetectionScriptHandle();
+    Statistics stats;
+    OcrServiceSettings settings;
+    PDDocument document;
+
+
+    @SneakyThrows
+    @Override
+    public void run() {
+
+        // Interrupting signals that the image extraction has finished
+        while (true) {
+            try {
+                final UnprocessedImage image = imageInputQueue.take();
+                OcrImage extractedOcrImage = this.process(image);
+                try {
+                    imageOutputQueue.put(extractedOcrImage);
+                } catch (InterruptedException e) {
+                    imageOutputQueue.put(extractedOcrImage);
+                    break;
+                }
+
+            } catch (InterruptedException e) {
+                break;
+            }
+        }
+        // empty the queue
+        List<UnprocessedImage> remainingImages = new ArrayList<>(imageInputQueue.size());
+        imageInputQueue.drainTo(remainingImages);
+        remainingImages.forEach(image -> {
+            OcrImage ocrImage = this.process(image);
+            try {
+                imageOutputQueue.put(ocrImage);
+            } catch (InterruptedException e) {
+                log.error(e.getMessage());
+            }
+        });
+
+        TessAPI1.TessBaseAPIDelete(this.detectionScriptHandle);
+    }
+
+
+    private OcrImage process(UnprocessedImage unprocessedImage) {
+
+        long timestamp = System.currentTimeMillis();
+
+        OcrImage ocrImage;
+        if (unprocessedImage instanceof ExtractedImage extractedImage) {
+            ocrImage = processExtractedImage(extractedImage);
+        } else if (unprocessedImage instanceof RenderedPageImageFile renderedPageImageFile) {
+            ocrImage = processRenderedPageImageFile(renderedPageImageFile);
+        } else {
+            throw new UnsupportedOperationException(String.format("Class %s is not supported!", unprocessedImage.getClass()));
+        }
+
+        stats.increaseImageProcessing(System.currentTimeMillis() - timestamp);
+
+        return ocrImage;
+    }
+
+
+    private OcrImage processRenderedPageImageFile(RenderedPageImageFile renderedPageImageFile) {
+
+        Pix pix = binarize(renderedPageImageFile.asPix(), settings.getDpi(), settings.getDpi());
+
+        int orientDegree = detectOrientation(pix, settings.getDpi(), detectionScriptHandle);
+        Pix rotatedPix = ImageProcessingUtils.deRotatePix(orientDegree, pix);
+
+        OcrImage ocrImage = new RenderedPageOcrImage(pix.h,
+                pix.w,
+                PageInformation.fromPDPage(renderedPageImageFile.pageNumber(), document.getPage(renderedPageImageFile.pageNumber() - 1)),
+                rotatedPix,
+                orientDegree);
+
+        if (pix != rotatedPix) {
+            LeptUtils.disposePix(pix);
+        }
+
+        return ocrImage;
+    }
+
+
+    private OcrImage processExtractedImage(ExtractedImage extractedImage) {
+
+        float imageDPI = Math.abs(extractedImage.image().getWidth() / (extractedImage.ctm().getScalingFactorX() / 72));
+
+        Pix pix = binarize(extractedImage.asPix(), imageDPI, settings.getDpi());
+
+        int orientDegree = detectOrientation(pix, settings.getDpi(), detectionScriptHandle);
+        Pix rotatedPix = ImageProcessingUtils.deRotatePix(orientDegree, pix);
+
+        OcrImage ocrImage = new ExtractedOcrImage(extractedImage.pageNumber(),
+                extractedImage.numberOnPage(),
+                extractedImage.height(),
+                extractedImage.width(),
+                extractedImage.ctm(),
+                rotatedPix,
+                pix.h,
+                pix.w,
+                orientDegree);
+
+        if (pix != rotatedPix) {
+            LeptUtils.disposePix(pix);
+        }
+        return ocrImage;
+    }
+
+
+
+
+    static public int detectOrientation(Pix pix, int dpi, ITessAPI.TessBaseAPI detectionScriptHandle) {
+
+        TessAPI1.TessBaseAPISetImage2(detectionScriptHandle, pix);
+        TessAPI1.TessBaseAPISetSourceResolution(detectionScriptHandle, dpi);
+
+        IntBuffer orientationDegreeResultBuffer;
+        FloatBuffer orientationDegreeConfidenceBuffer;
+        PointerByReference scriptureNameBuffer;
+        FloatBuffer scriptureConfidenceBuffer;
+
+        orientationDegreeResultBuffer = IntBuffer.allocate(1);
+        orientationDegreeConfidenceBuffer = FloatBuffer.allocate(1);
+        scriptureNameBuffer = new PointerByReference();
+        scriptureConfidenceBuffer = FloatBuffer.allocate(1);
+
+        int orientationDegree = 0;
+        int result = TessAPI1.TessBaseAPIDetectOrientationScript(detectionScriptHandle,
+                orientationDegreeResultBuffer,
+                orientationDegreeConfidenceBuffer,
+                scriptureNameBuffer,
+                scriptureConfidenceBuffer);
+        if (result == TRUE && orientationDegreeConfidenceBuffer.get() > 10) {
+            orientationDegree = orientationDegreeResultBuffer.get();
+        }
+
+        TessAPI1.TessBaseAPIClear(detectionScriptHandle);
+
+        return orientationDegree;
+    }
+
+
+    @SneakyThrows
+    private Pix binarize(Pix pix, float imageDpi, int targetDpi) {
+
+        Pix grayScale = ImageProcessingUtils.convertToGrayScale(pix);
+        Pix scaledUp = ImageProcessingUtils.scaleToTargetDpi(imageDpi, targetDpi, grayScale);
+        return ImageProcessingUtils.despecklePix(scaledUp);
+
+    }
+
+
+    private static ITessAPI.TessBaseAPI initDetectionScriptHandle() {
+
+        ITessAPI.TessBaseAPI handle = TessAPI1.TessBaseAPICreate();
+        String datapath = System.getenv("TESSDATA_PREFIX");
+        TessAPI1.TessBaseAPIInit3(handle, datapath, "osd");
+
+        return handle;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/OCRThread.java

@@ -0,0 +1,141 @@
+package com.knecon.fforesight.service.ocr.processor.service.threads;
+
+import static net.sourceforge.tess4j.ITessAPI.TRUE;
+import static net.sourceforge.tess4j.TessAPI1.TessBaseAPICreate;
+import static net.sourceforge.tess4j.TessAPI1.TessBaseAPIInit1;
+import static net.sourceforge.tess4j.TessAPI1.TessBaseAPISetPageSegMode;
+import static net.sourceforge.tess4j.TessAPI1.TessBaseAPISetVariable;
+
+import java.io.File;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.concurrent.BlockingQueue;
+
+import com.knecon.fforesight.service.ocr.processor.settings.OcrServiceSettings;
+import com.knecon.fforesight.service.ocr.processor.model.OcrImage;
+import com.knecon.fforesight.service.ocr.processor.model.OcrResult;
+import com.knecon.fforesight.service.ocr.processor.service.OcrProgressLogger;
+import com.knecon.fforesight.service.ocr.processor.service.Statistics;
+import com.knecon.fforesight.service.ocr.processor.utils.Tesseract2;
+import com.sun.jna.StringArray;
+import com.sun.jna.ptr.PointerByReference;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.lept4j.util.LeptUtils;
+import net.sourceforge.tess4j.ITessAPI;
+import net.sourceforge.tess4j.ITesseract;
+import net.sourceforge.tess4j.TessAPI1;
+
+@Slf4j
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class OCRThread extends Thread {
+
+    int id;
+    BlockingQueue<OcrImage> imageInputQueue;
+    Path tesseractOutputDir;
+    List<OcrResult> results;
+    OcrProgressLogger logger;
+    Statistics stats;
+    OcrServiceSettings settings;
+    Tesseract2 instance;
+
+
+    public OCRThread(int id,
+                     BlockingQueue<OcrImage> imageInputQueue,
+                     Path tesseractOutputDir,
+                     List<OcrResult> results,
+                     OcrProgressLogger logger,
+                     Statistics stats,
+                     OcrServiceSettings settings) {
+
+        this.id = id;
+        this.imageInputQueue = imageInputQueue;
+        this.tesseractOutputDir = tesseractOutputDir;
+        this.results = results;
+        this.logger = logger;
+        this.stats = stats;
+        this.settings = settings;
+        this.instance = createInstance(settings);
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void run() {
+
+        // Interrupting signals that the image extraction has finished
+        while (!isInterrupted()) {
+            try {
+                final OcrImage image = imageInputQueue.take();
+                this.process(image);
+            } catch (InterruptedException e) {
+                // set isInterrupted to true (This exception may only happen during active waiting for queue, and then isInterrupted will not be set!)
+                interrupt();
+            }
+        }
+        // empty the queue
+        try {
+            while (true) {
+                final OcrImage image = imageInputQueue.remove();
+                this.process(image);
+            }
+        } catch (NoSuchElementException e) {
+            log.debug("Executed tesseract on all Images, finishing.");
+        }
+
+    }
+
+
+    private void process(OcrImage image) {
+
+        long timestamp = System.currentTimeMillis();
+        String tmpOutputFileName = String.format("output_%04d_%04d", image.getPageNumber(), image.getNumberOnPage());
+        String tesseractOutputFileName = tesseractOutputDir.resolve(tmpOutputFileName).toFile().toString();
+
+        int psm = settings.getPsmOverride() < 0 ? image.getOptimalPageSegmentationMode() : settings.getPsmOverride();
+
+        executeTesseract(psm, image.getDpi(), image.getPix(), tesseractOutputFileName);
+        image.destroyPix();
+
+        results.add(OcrResult.create(image, tesseractOutputFileName));
+        logger.logImageFinished(image, psm);
+        stats.increaseTesseractDuration(id, System.currentTimeMillis() - timestamp);
+    }
+
+
+    @SneakyThrows
+    public void executeTesseract(int psm, int dpi, Pix pix, String tesseractOutputFileName) {
+
+        if (settings.isDebug()) {
+            String[] a = tesseractOutputFileName.split("/");
+            String folder = "/tmp/pixs/" + a[a.length - 3];
+            new File(folder).mkdirs();
+            Leptonica1.pixWrite(folder + "/pix_" + a[a.length - 1] + ".png", pix, 3);
+        }
+
+        instance.setVariable("user_defined_dpi", String.valueOf(dpi));
+        instance.setPageSegMode(psm);
+        instance.createDocumentsWithResults(pix, null, tesseractOutputFileName, List.of(ITesseract.RenderedFormat.HOCR), ITessAPI.TessPageIteratorLevel.RIL_BLOCK);
+    }
+
+
+    private static Tesseract2 createInstance(OcrServiceSettings settings) {
+
+        Tesseract2 instance = new Tesseract2();
+        instance.setVariable("debug_file", "/dev/null"); // remove warnings from std out
+        instance.setOcrEngineMode(1); // set to LSTM based Engine
+        instance.setLanguage(settings.getLanguages());
+        return instance;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/settings/OcrServiceSettings.java

@@ -0,0 +1,27 @@
+package com.knecon.fforesight.service.ocr.processor.settings;
+
+import org.apache.pdfbox.cos.COSName;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+@Data
+@ConfigurationProperties("ocr-service")
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class OcrServiceSettings {
+
+    int ocrThreadCount = 4; // Number of OCR threads
+    int imageExtractThreadCount = 2; // Number of image extraction threads
+    int gsProcessCount = 1; // Number of Ghostscript processes
+    int dpi = 300; // Target DPI for binarized images
+    int psmOverride = -1; // Overrides the page segmentation mode if > 0
+    int minImageHeight = 20; // Minimum height for images to be processed
+    int minImageWidth = 20; // Minimum width for images to be processed
+    boolean debug; // If true, overlays OCR images with a grid and draws word bounding boxes
+    boolean removeWatermark; // If true, watermarks will be removed
+    String languages = "deu+eng"; // Defines languages loaded into Tesseract as 3-char codes, additional languages must also be installed in the docker environment
+    COSName ocrMarkedContentTag = COSName.getPDFName("KNECON_OCR");
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/utils/ImageProcessingUtils.java

@@ -0,0 +1,131 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Transparency;
+import java.awt.image.BufferedImage;
+
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+
+import com.knecon.fforesight.service.ocr.processor.model.ExtractedImage;
+
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.lept4j.util.LeptUtils;
+
+@UtilityClass
+public class ImageProcessingUtils {
+
+    public BufferedImage convertToDeviceColorSpace(ExtractedImage extractedImage) {
+
+        BufferedImage image;
+        if (extractedImage.colorSpace() instanceof PDDeviceRGB || extractedImage.colorSpace() instanceof PDDeviceGray) {
+            image = extractedImage.image();
+        } else {
+            BufferedImage pdfImage = extractedImage.image();
+            image = new BufferedImage(pdfImage.getWidth(), pdfImage.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
+            Graphics g = image.getGraphics();
+            g.drawImage(pdfImage, 0, 0, null);
+            g.dispose();
+        }
+        return image;
+    }
+
+
+    public static Pix despecklePix(Pix pix) {
+
+        assert pix.d == 8;
+        Pix despeckled;
+        if (pix.w < 100 || pix.h < 100) {
+            // too small to properly despeckle, just binarize instead.
+            despeckled = Leptonica1.pixThresholdToBinary(pix, 180);
+        } else {
+            despeckled = LeptUtils.despeckle(pix,
+                    LeptUtils.SEL_STR3,
+                    3); // sometimes this fails and I can't figure out why. Then we skip the despeckling and just simply convert to binary. Might have something to do with Imagesize, not sure though...
+            if (despeckled == null) {
+                despeckled = Leptonica1.pixThresholdToBinary(pix, 180);
+            }
+        }
+        if (pix != despeckled) {
+            LeptUtils.disposePix(pix);
+        }
+        return despeckled;
+    }
+
+
+    public static Pix scaleToTargetDpi(float imageDpi, int targetDpi, Pix grayScale) {
+
+        float targetFactor = targetDpi / imageDpi;
+
+        if (targetFactor > 3) {
+            Pix scaledUp;
+            scaledUp = Leptonica1.pixScaleGray4xLI(grayScale);
+            LeptUtils.disposePix(grayScale);
+            return scaledUp;
+        } else if (targetFactor > 1.9) {
+            Pix scaledUp;
+            scaledUp = Leptonica1.pixScaleGray2xLI(grayScale);
+            LeptUtils.disposePix(grayScale);
+            return scaledUp;
+        } else {
+            return grayScale;
+        }
+    }
+
+
+    @SneakyThrows
+    public static Pix convertToGrayScale(Pix pix) {
+
+        if (pix.d == 8) {
+            return pix;
+        } else if (pix.d == 32) {
+            Pix grayScale = Leptonica1.pixConvertRGBToGrayFast(pix);
+            LeptUtils.disposePix(pix);
+            return grayScale;
+        } else if (pix.d == 1) {
+            Pix grayScale = Leptonica1.pixConvert1To8(null, pix, (byte) 0, (byte) 255);
+            LeptUtils.disposePix(pix);
+            return grayScale;
+        } else {
+            throw new UnsupportedOperationException(String.format("Unknown pix format with bpp of %d", pix.d));
+        }
+    }
+
+
+    public Pix deRotatePix(int orientDegree, Pix pix) {
+
+        return switch (360 - orientDegree) {
+            case 90 -> Leptonica1.pixRotateOrth(pix, 1);
+            case 180 -> Leptonica1.pixRotateOrth(pix, 2);
+            case 270 -> Leptonica1.pixRotateOrth(pix, 3);
+            default -> pix;
+        };
+    }
+
+
+    public static void setAlphaChannelToWhite(BufferedImage image) {
+
+        if (image.getTransparency() == Transparency.TRANSLUCENT) {
+            // NOTE: For BITMASK images, the color model is likely IndexColorModel,
+            // and this model will contain the "real" color of the transparent parts
+            // which is likely a better fit than unconditionally setting it to white.
+
+            // Fill background  with white
+            Graphics2D graphics = image.createGraphics();
+            try {
+                graphics.setComposite(AlphaComposite.DstOver); // Set composite rules to paint "behind"
+                graphics.setPaint(Color.WHITE);
+                graphics.fillRect(0, 0, image.getWidth(), image.getHeight());
+            } finally {
+                graphics.dispose();
+            }
+        }
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/utils/ListSplittingUtils.java

@@ -0,0 +1,64 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class ListSplittingUtils {
+
+    public List<List<Integer>> buildBalancedContinuousSublist(Integer totalNumberOfEntries, int threadCount) {
+
+        return buildBalancedSublist(IntStream.range(0, totalNumberOfEntries).map(i -> i + 1).boxed().toList(), threadCount);
+    }
+
+
+    public <T> List<List<T>> buildBalancedSublist(List<T> entries, int threadCount) {
+
+        List<Integer> balancedEntryCounts = buildBalancedEntryCounts(entries.size(), threadCount);
+        List<List<T>> balancedSublist = new ArrayList<>(threadCount);
+        int startIdx = 0;
+        for (Integer numberOfEntriesPerThread : balancedEntryCounts) {
+            balancedSublist.add(entries.subList(startIdx, startIdx + numberOfEntriesPerThread));
+            startIdx += numberOfEntriesPerThread;
+        }
+        return balancedSublist;
+    }
+
+
+    public <T> List<List<List<T>>> buildBatchedBalancedSublist(List<T> entries, int threadCount, int batchSize) {
+
+        // batches -> threads -> entries
+        List<List<List<T>>> batchedBalancedSubList = new LinkedList<>();
+        List<List<List<T>>> threadsWithBatches = buildBalancedSublist(entries, threadCount).stream().map(list -> buildBalancedSublist(list, batchSize)).toList();
+        // swap first two dimensions
+        for (int batchIdx = 0; batchIdx < batchSize; batchIdx++) {
+            List<List<T>> threadEntriesPerBatch = new ArrayList<>(threadCount);
+            for (int threadIdx = 0; threadIdx < threadCount; threadIdx++) {
+                threadEntriesPerBatch.add(threadsWithBatches.get(threadIdx).get(batchIdx));
+            }
+            batchedBalancedSubList.add(threadEntriesPerBatch);
+
+        }
+        return batchedBalancedSubList;
+    }
+
+
+    public List<Integer> buildBalancedEntryCounts(int totalNumberOfEntries, int threadCount) {
+
+        List<Integer> numberOfPagesPerThread = new ArrayList<>(threadCount);
+        for (int i = 0; i < threadCount; i++) {
+            numberOfPagesPerThread.add(0);
+        }
+        int threadIdx;
+        for (int i = 0; i < totalNumberOfEntries; i++) {
+            threadIdx = i % threadCount;
+            numberOfPagesPerThread.set(threadIdx, numberOfPagesPerThread.get(threadIdx) + 1);
+        }
+        return numberOfPagesPerThread;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/utils/PdfDpiCalculator.java

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import java.awt.geom.AffineTransform;
+import com.knecon.fforesight.service.ocr.processor.model.QuadPoint;
+import lombok.AccessLevel;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class PdfDpiCalculator {
+
+    public int calculateDpi(QuadPoint imageBounds, AffineTransform imageCTM, double width) {
+
+        QuadPoint transformedImageBounds = imageBounds.getTransformed(imageCTM);
+        double transformedWidth = transformedImageBounds.a().distance(transformedImageBounds.d());
+        double widthInInches = transformedWidth * 1 / 72;
+        return (int) Math.ceil(width / widthInInches);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/utils/PdfDraw.java

@@ -1,4 +1,4 @@
-package com.iqser.red.service.ocr.v1.server.utils;
+package com.knecon.fforesight.service.ocr.processor.utils;
 
 import com.pdftron.pdf.ColorPt;
 import com.pdftron.pdf.ColorSpace;

ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/utils/Tesseract2.java

@@ -0,0 +1,141 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import java.awt.Rectangle;
+import java.nio.IntBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.jna.Pointer;
+
+import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.lept4j.Pix;
+import net.sourceforge.tess4j.OCRResult;
+import net.sourceforge.tess4j.TessAPI1;
+import net.sourceforge.tess4j.Tesseract1;
+import net.sourceforge.tess4j.TesseractException;
+import net.sourceforge.tess4j.Word;
+
+@Slf4j
+/**
+ * Overriden version only so I can use Tesseract1 with Pixs instead of BufferedImages. All Functions are copied and then the BufferedImage -> Pix conversion deleted.
+ */
+public class Tesseract2 extends Tesseract1 {
+
+
+    private int createDocuments(Pix pix, String filename, TessResultRenderer renderer) {
+
+        String title = TessBaseAPIGetStringVariable(getHandle(), DOCUMENT_TITLE);
+        TessResultRendererBeginDocument(renderer, title);
+        int result = TessBaseAPIProcessPage(getHandle(), pix, 0, filename, null, 0, renderer);
+        TessResultRendererEndDocument(renderer);
+
+//        if (result == ITessAPI.FALSE) {
+//            throw new TesseractException("Error during processing page.");
+//        }
+
+        return TessBaseAPIMeanTextConf(getHandle());
+    }
+
+
+    public OCRResult createDocumentsWithResults(Pix bi, String filename, String outputbase, List<RenderedFormat> formats, int pageIteratorLevel) throws TesseractException {
+
+        List<OCRResult> results = createDocumentsWithResults(new Pix[]{bi}, new String[]{filename}, new String[]{outputbase}, formats, pageIteratorLevel);
+        if (!results.isEmpty()) {
+            return results.get(0);
+        } else {
+            return null;
+        }
+    }
+
+
+    public List<OCRResult> createDocumentsWithResults(Pix[] pixs, String[] filenames, String[] outputbases, List<RenderedFormat> formats, int pageIteratorLevel) {
+
+        if (pixs.length != filenames.length || pixs.length != outputbases.length) {
+            throw new RuntimeException("The three arrays must match in length.");
+        }
+
+        init();
+        setVariables();
+
+        List<OCRResult> results = new ArrayList<OCRResult>();
+
+        try {
+            for (int i = 0; i < pixs.length; i++) {
+                try {
+                    TessResultRenderer renderer = createRenderers(outputbases[i], formats);
+                    int meanTextConfidence = createDocuments(pixs[i], filenames[i], renderer);
+                    TessDeleteResultRenderer(renderer);
+                    List<Word> words = meanTextConfidence > 0 ? getRecognizedWords(pageIteratorLevel) : new ArrayList<Word>();
+                    results.add(new OCRResult(meanTextConfidence, words));
+                } catch (Exception e) {
+                    // skip the problematic image file
+                    log.warn(e.getMessage(), e);
+                }
+            }
+        } finally {
+            dispose();
+        }
+
+        return results;
+    }
+
+
+    private List<Word> getRecognizedWords(int pageIteratorLevel) {
+
+        List<Word> words = new ArrayList<>();
+
+        try {
+            TessResultIterator ri = TessBaseAPIGetIterator(getHandle());
+            TessPageIterator pi = TessResultIteratorGetPageIterator(ri);
+            TessPageIteratorBegin(pi);
+
+            do {
+                Pointer ptr = TessResultIteratorGetUTF8Text(ri, pageIteratorLevel);
+                if (ptr == null) {
+                    continue;
+                }
+                String text = ptr.getString(0);
+                TessAPI1.TessDeleteText(ptr);
+                float confidence = TessResultIteratorConfidence(ri, pageIteratorLevel);
+                IntBuffer leftB = IntBuffer.allocate(1);
+                IntBuffer topB = IntBuffer.allocate(1);
+                IntBuffer rightB = IntBuffer.allocate(1);
+                IntBuffer bottomB = IntBuffer.allocate(1);
+                TessPageIteratorBoundingBox(pi, pageIteratorLevel, leftB, topB, rightB, bottomB);
+                int left = leftB.get();
+                int top = topB.get();
+                int right = rightB.get();
+                int bottom = bottomB.get();
+                Word word = new Word(text, confidence, new Rectangle(left, top, right - left, bottom - top));
+                words.add(word);
+            } while (TessPageIteratorNext(pi, pageIteratorLevel) == TRUE);
+//            TessPageIteratorDelete(pi);
+            TessResultIteratorDelete(ri);
+        } catch (Exception e) {
+            log.warn(e.getMessage(), e);
+        }
+
+        return words;
+    }
+
+
+    private TessResultRenderer createRenderers(String outputbase, List<RenderedFormat> formats) {
+
+        TessResultRenderer renderer = null;
+
+        for (RenderedFormat format : formats) {
+            switch (format) {
+
+                case HOCR:
+                    if (renderer == null) {
+                        renderer = TessHOcrRendererCreate(outputbase);
+                    } else {
+                        TessResultRendererInsert(renderer, TessHOcrRendererCreate(outputbase));
+                    }
+                    break;
+            }
+        }
+        return renderer;
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/test/java/com/knecon/fforesight/service/ocr/processor/service/Type0FontMetricsFactoryTest.java

@@ -0,0 +1,29 @@
+package com.knecon.fforesight.service.ocr.processor.service;
+
+import java.io.File;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.jupiter.api.Test;
+
+import com.knecon.fforesight.service.ocr.processor.model.FontMetrics;
+import com.knecon.fforesight.service.ocr.processor.service.fonts.Type0FontMetricsFactory;
+
+import lombok.SneakyThrows;
+import lombok.experimental.SuperBuilder;
+
+@SuppressWarnings("PMD")
+class Type0FontMetricsFactoryTest {
+
+    @Test
+    @SneakyThrows
+    public void testStringWidth() {
+
+        try (PDDocument document = Loader.loadPDF(new File(Type0FontMetricsFactoryTest.class.getClassLoader().getResource("InvisibleText.pdf").getPath()))) {
+            Type0FontMetricsFactory metricsFactory = new Type0FontMetricsFactory(document);
+            FontMetrics fontMetrics = metricsFactory.calculateMetrics("deine mutter", 100, 50);
+        }
+
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/test/java/com/knecon/fforesight/service/ocr/processor/utils/ImageProcessingUtilsTest.java

@@ -0,0 +1,36 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import static net.sourceforge.lept4j.ILeptonica.IFF_PNG;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import net.sourceforge.lept4j.Leptonica1;
+import net.sourceforge.lept4j.Pix;
+
+@Disabled
+class ImageProcessingUtilsTest {
+
+    @BeforeEach
+    public void loadLeptonica() {
+
+        System.setProperty("jna.library.path", System.getenv("VCPKG_DYNAMIC_LIB"));
+    }
+
+
+    @Test
+    public void testRotation() {
+
+        Pix pix = Leptonica1.pixRead("/home/kschuettler/Downloads/painHarold.webp");
+        Pix pix2 = ImageProcessingUtils.deRotatePix(0, pix);
+        Leptonica1.pixWrite("/tmp/0.png", pix2, IFF_PNG);
+        Pix pix3 = ImageProcessingUtils.deRotatePix(90, pix);
+        Leptonica1.pixWrite("/tmp/90.png", pix3, IFF_PNG);
+        Pix pix4 = ImageProcessingUtils.deRotatePix(180, pix);
+        Leptonica1.pixWrite("/tmp/180.png", pix4, IFF_PNG);
+        Pix pix5 = ImageProcessingUtils.deRotatePix(270, pix);
+        Leptonica1.pixWrite("/tmp/270.png", pix5, IFF_PNG);
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/test/java/com/knecon/fforesight/service/ocr/processor/utils/ListSplittingUtilsTest.java

@@ -0,0 +1,21 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collection;
+
+import org.junit.jupiter.api.Test;
+
+class ListSplittingUtilsTest {
+
+    @Test
+    public void testBalancedListSplitting() {
+
+        int threadCount = 18;
+        int numberOfPages = 48;
+        var balancedList = ListSplittingUtils.buildBalancedContinuousSublist(numberOfPages, threadCount);
+        assertEquals(threadCount, balancedList.size());
+        assertEquals(numberOfPages, balancedList.stream().mapToLong(Collection::size).sum());
+    }
+
+}

ocr-service-v1/ocr-service-processor/src/test/java/com/knecon/fforesight/service/ocr/processor/utils/Pdf2ImgTest.java

@@ -0,0 +1,83 @@
+package com.knecon.fforesight.service.ocr.processor.utils;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.apache.pdfbox.tools.imageio.ImageIOUtil;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.FileSystemUtils;
+
+import com.knecon.fforesight.service.ocr.processor.service.OsUtils;
+import com.knecon.fforesight.service.ocr.processor.service.threads.GhostScriptOutputHandler;
+
+import lombok.SneakyThrows;
+
+// YOU NEED GHOSTSCRIPT INSTALLED TO RUN THIS TEST!!!!
+@Disabled
+public class Pdf2ImgTest {
+
+    private static final int DPI = 150;
+
+
+    @Test
+    @SneakyThrows
+    @Disabled
+    public void testPDFBox() {
+
+        String outputDir = OsUtils.getTemporaryDirectory("imageOutput", "");
+        new File(outputDir).mkdirs();
+        ClassPathResource resource = new ClassPathResource("files/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
+        try (PDDocument document = Loader.loadPDF(resource.getFile())) {
+            PDFRenderer renderer = new PDFRenderer(document);
+            for (int pageNumber = 0; pageNumber < document.getNumberOfPages(); pageNumber++) {
+                BufferedImage image = renderer.renderImageWithDPI(pageNumber, DPI);
+                boolean written = ImageIOUtil.writeImage(image, "tif", new File(outputDir + String.format("page%04d", pageNumber)).getAbsolutePath(), DPI);
+                System.out.printf("%d: %s%n", pageNumber, written);
+            }
+        }
+        FileSystemUtils.deleteRecursively(new File(outputDir));
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testGhostScriptParallel() {
+
+        int numOfProcesses = 5;
+        ClassPathResource resource = new ClassPathResource("files/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
+        String outputDir = "/tmp/ghostscript_out/";
+        List<Process> processes = IntStream.range(0, numOfProcesses).boxed().parallel().map(i -> buildCmdArgs(i, outputDir, resource)).map(Pdf2ImgTest::executeProcess).toList();
+
+        List<Integer> processExitCodes = new LinkedList<>();
+        for (Process process : processes) {
+            processExitCodes.add(process.waitFor());
+        }
+        System.out.println("Ghostscripts finished with exit codes " + processExitCodes);
+        FileSystemUtils.deleteRecursively(new File(outputDir));
+    }
+
+
+    @SneakyThrows
+    private static Process executeProcess(String[] cmdArgs) {
+
+        return Runtime.getRuntime().exec(cmdArgs);
+    }
+
+
+    @SneakyThrows
+    private static String[] buildCmdArgs(Integer i, String outputDir, ClassPathResource resource) {
+
+        String outDir = outputDir + "/" + i + "/";
+        new File(outDir).mkdirs();
+        return new String[]{"gs", "-dNOPAUSE", "-sDEVICE=tiffgray", "-r" + DPI, "-sOutputFile=" + outDir + "page%04d", resource.getFile().toString(), "-c", "quit"};
+    }
+
+}

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

@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.iqser.red.service</groupId>
-        <artifactId>ocr-service-v1</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>ocr-service-server-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>ocr-service-api-v1</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>storage-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>spring-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>metric-commons</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.pdftron</groupId>
-            <artifactId>PDFNet</artifactId>
-            <version>9.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>2.3.1.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-kms</artifactId>
-            <version>1.12.158</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>test-commons</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <!-- generate git.properties for exposure in /info -->
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>revision</goal>
-                        </goals>
-                        <configuration>
-                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                            <gitDescribe>
-                                <tags>true</tags>
-                            </gitDescribe>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <annotationProcessors>
-                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
-                    </annotationProcessors>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- repackages the generated jar into a runnable fat-jar and makes it
-                    executable -->
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <executable>true</executable>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>pdftron</id>
-            <name>PDFNet Maven</name>
-            <url>https://pdftron.com/maven/release</url>
-        </repository>
-    </repositories>
-
-
-</project>

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/client/TenantsClient.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ClippingPathStack.java

@@ -1,68 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model;
-
-import static com.iqser.red.service.ocr.v1.server.service.InvisibleElementRemovalService.TOLERANCE;
-
-import java.awt.geom.Area;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
-import java.util.Deque;
-import java.util.LinkedList;
-
-import com.pdftron.pdf.Rect;
-
-import lombok.Data;
-import lombok.SneakyThrows;
-
-@Data
-public class ClippingPathStack {
-
-    private Deque<Area> stack = new LinkedList<>();
-
-
-    @SneakyThrows
-    public ClippingPathStack(Rect rectangle) {
-
-        stack.push(new Area(new Rectangle2D.Double(rectangle.getX1(), rectangle.getY1(), rectangle.getWidth(), rectangle.getHeight()).getBounds2D()));
-    }
-
-
-    @SneakyThrows
-    public void intersectClippingPath(GeneralPath path) {
-
-        getCurrentClippingPath().intersect(new Area(path));
-    }
-
-
-    public boolean almostIntersects(double x, double y, double width, double height) {
-        // To address inconsistencies in the calculation of the bounding box we slightly increase the rectangle
-        // Height or width are zero for straight lines, even though they are being rendered. Therefore, height or width must be at minimum >0.
-
-        double x_with_tolerance = x > 0 ? x - TOLERANCE : x + TOLERANCE;
-        double y_with_tolerance = y > 0 ? y - TOLERANCE : y + TOLERANCE;
-        double width_with_tolerance = width + (2 * TOLERANCE);
-        double height_with_tolerance = height + (2 * TOLERANCE);
-        return getCurrentClippingPath().intersects(x_with_tolerance, y_with_tolerance, width_with_tolerance, height_with_tolerance);
-    }
-
-
-    public Area getCurrentClippingPath() {
-
-        return stack.peek();
-    }
-
-
-    public void enterNewGState() {
-
-        Area current = stack.peek();
-        Area cloned = new Area();
-        cloned.add(current);
-        stack.push(cloned);
-    }
-
-
-    public void leaveGState() {
-
-        stack.pop();
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ElementFeatures.java

@@ -1,170 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model;
-
-import static com.iqser.red.service.ocr.v1.server.service.InvisibleElementRemovalService.TOLERANCE;
-
-import java.awt.geom.Rectangle2D;
-
-import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.Element;
-import com.pdftron.pdf.Rect;
-
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.SneakyThrows;
-import lombok.experimental.FieldDefaults;
-import lombok.experimental.SuperBuilder;
-
-@Getter
-@SuperBuilder
-@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-public class ElementFeatures {
-
-    int elementType;
-    Rectangle2D boundingBox;
-
-
-    public boolean almostMatches(Element element) throws PDFNetException {
-
-        return element.getType() == elementType && //
-                element.getBBox() != null && //
-                rectsAlmostMatch(element.getBBox());
-    }
-
-
-    protected boolean almostEqual(double a, double b) {
-
-        return Math.abs(a - b) < TOLERANCE;
-    }
-
-
-    @SneakyThrows
-    private boolean rectsAlmostMatch(Rect bBox) {
-        // To address the inconsistencies in the calculation of the bounding box we check equality with a tolerance
-
-        return almostEqual(bBox.getX1(), boundingBox.getX()) && //
-                almostEqual(bBox.getY1(), boundingBox.getY()) && //
-                almostEqual(bBox.getWidth(), boundingBox.getWidth()) && //
-                almostEqual(bBox.getHeight(), boundingBox.getHeight());
-    }
-
-
-    @EqualsAndHashCode(callSuper = true)
-    @Getter
-    @SuperBuilder
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    private static class Text extends ElementFeatures {
-
-        String text;
-        int font;
-        double fontsize;
-
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-
-            return super.almostMatches(element) && //
-                    text.equals(element.getTextString()) && //
-                    font == element.getGState().getFont().getType() && //
-                    almostEqual(fontsize, element.getGState().getFontSize());
-        }
-
-    }
-
-    @EqualsAndHashCode(callSuper = true)
-    @Getter
-    @SuperBuilder
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    private static class Path extends ElementFeatures {
-
-        boolean isClippingPath;
-        boolean isClipWindingFill;
-        boolean isStroked;
-        boolean isFilled;
-        boolean isWindingFill;
-
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-
-            return super.almostMatches(element) && //
-                    isClippingPath == element.isClippingPath() && //
-                    isClipWindingFill == element.isClipWindingFill() && //
-                    isStroked == element.isStroked() && //
-                    isFilled == element.isFilled() && //
-                    isWindingFill == element.isWindingFill();
-
-        }
-
-    }
-
-    @EqualsAndHashCode(callSuper = true)
-    @Getter
-    @SuperBuilder
-    @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-    private static class Image extends ElementFeatures {
-
-        int dataSize;
-        int height;
-        int width;
-        int renderingIntent;
-        int componentNum;
-        int bitsPerComponent;
-
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-
-            return super.almostMatches(element) && //
-                    dataSize == element.getImageDataSize() && //
-                    height == element.getImageHeight() && //
-                    width == element.getImageWidth() && //
-                    renderingIntent == element.getImageRenderingIntent() && //
-                    componentNum == element.getComponentNum() && //
-                    bitsPerComponent == element.getBitsPerComponent();
-        }
-
-    }
-
-
-    public static ElementFeatures extractFeatures(Element element) throws PDFNetException {
-
-        return switch (element.getType()) {
-            case Element.e_path -> Path.builder()
-                    .elementType(element.getType())
-                    .boundingBox(toRectangle2D(element.getBBox()))
-                    .isClippingPath(element.isClippingPath())
-                    .isClipWindingFill(element.isClipWindingFill())
-                    .isStroked(element.isStroked())
-                    .isFilled(element.isFilled())
-                    .isWindingFill(element.isWindingFill())
-                    .build();
-            case Element.e_text -> Text.builder()
-                    .elementType(element.getType())
-                    .boundingBox(toRectangle2D(element.getBBox()))
-                    .text(element.getTextString())
-                    .font(element.getGState().getFont().getType())
-                    .fontsize(element.getGState().getFontSize())
-                    .build();
-            case Element.e_image, Element.e_inline_image -> Image.builder()
-                    .elementType(element.getType())
-                    .boundingBox(toRectangle2D(element.getBBox()))
-                    .dataSize(element.getImageDataSize())
-                    .height(element.getImageHeight())
-                    .width(element.getImageWidth())
-                    .renderingIntent(element.getImageRenderingIntent())
-                    .componentNum(element.getComponentNum())
-                    .bitsPerComponent(element.getBitsPerComponent())
-                    .build();
-            // This technically should never happen, it's a safetynet
-            default -> throw new RuntimeException("Feature Extraction is not supported for PDFTron.Element with type: " + element.getType());
-        };
-    }
-
-
-    private static Rectangle2D toRectangle2D(Rect rect) throws PDFNetException {
-
-        return new Rectangle2D.Double(rect.getX1(), rect.getY1(), rect.getWidth(), rect.getHeight());
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ImagePosition.java

@@ -1,16 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model;
-
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class ImagePosition {
-
-    private Rectangle rectangle;
-    private boolean hasTransparency;
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/Classification.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/FilterGeometry.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/Filters.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/Geometry.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageFormat.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageMetadata.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageServiceResponse.java

@@ -1,31 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model.image;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.dslplatform.json.CompiledJson;
-import com.dslplatform.json.JsonAttribute;
-import com.fasterxml.jackson.annotation.JsonAlias;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.Data;
-
-@Data
-@CompiledJson
-public class ImageServiceResponse {
-
-    private String dossierId;
-    private String fileId;
-
-    @JsonProperty(value = "imageMetadata")
-    @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    private List<ImageMetadata> data = new ArrayList<>();
-
-
-    @JsonProperty(value = "imageMetadata")
-    @JsonAlias("data")
-    @JsonAttribute(alternativeNames = {"imageMetadata"})
-    public void setData(List<ImageMetadata> data) {this.data = data;}
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageSize.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/Position.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/Probability.java

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

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/AsyncConfig.java

@@ -1,27 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import java.util.concurrent.Executor;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-@Configuration
-public class AsyncConfig extends AsyncConfigurerSupport {
-
-    @Override
-    public Executor getAsyncExecutor() {
-
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-
-        executor.setCorePoolSize(7);
-        executor.setMaxPoolSize(42);
-        executor.setQueueCapacity(11);
-        executor.setThreadNamePrefix("TenantAwareTaskExecutor-");
-        executor.setTaskDecorator(new TenantAwareTaskDecorator());
-        executor.initialize();
-
-        return executor;
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/EncryptionDecryptionService.java

@@ -1,105 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-import java.security.spec.KeySpec;
-import java.util.Base64;
-
-import javax.annotation.PostConstruct;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import lombok.SneakyThrows;
-
-@Service
-public class EncryptionDecryptionService {
-
-    @Value("${ocr-service.crypto.key:redaction}")
-    private String key;
-
-    private SecretKey secretKey;
-    private byte[] iv;
-
-
-    @SneakyThrows
-    @PostConstruct
-    protected void postConstruct() {
-
-        SecureRandom secureRandom = new SecureRandom();
-        iv = new byte[12];
-        secureRandom.nextBytes(iv);
-        secretKey = generateSecretKey(key, iv);
-    }
-
-
-    @SneakyThrows
-    public String encrypt(String strToEncrypt) {
-
-        return Base64.getEncoder().encodeToString(encrypt(strToEncrypt.getBytes()));
-    }
-
-
-    @SneakyThrows
-    public String decrypt(String strToDecrypt) {
-
-        byte[] bytes = Base64.getDecoder().decode(strToDecrypt);
-        return new String(decrypt(bytes), StandardCharsets.UTF_8);
-    }
-
-
-    @SneakyThrows
-    public byte[] encrypt(byte[] data) {
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, parameterSpec);
-        byte[] encryptedData = cipher.doFinal(data);
-        ByteBuffer byteBuffer = ByteBuffer.allocate(4 + iv.length + encryptedData.length);
-        byteBuffer.putInt(iv.length);
-        byteBuffer.put(iv);
-        byteBuffer.put(encryptedData);
-        return byteBuffer.array();
-    }
-
-
-    @SneakyThrows
-    public byte[] decrypt(byte[] encryptedData) {
-
-        ByteBuffer byteBuffer = ByteBuffer.wrap(encryptedData);
-        int noonceSize = byteBuffer.getInt();
-        if (noonceSize < 12 || noonceSize >= 16) {
-            throw new IllegalArgumentException("Nonce size is incorrect. Make sure that the incoming data is an AES encrypted file.");
-        }
-        byte[] iv = new byte[noonceSize];
-        byteBuffer.get(iv);
-
-        SecretKey secretKey = generateSecretKey(key, iv);
-
-        byte[] cipherBytes = new byte[byteBuffer.remaining()];
-        byteBuffer.get(cipherBytes);
-
-        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-        GCMParameterSpec parameterSpec = new GCMParameterSpec(128, iv);
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, parameterSpec);
-        return cipher.doFinal(cipherBytes);
-    }
-
-
-    @SneakyThrows
-    public SecretKey generateSecretKey(String password, byte[] iv) {
-
-        KeySpec spec = new PBEKeySpec(password.toCharArray(), iv, 65536, 128); // AES-128
-        SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
-        byte[] key = secretKeyFactory.generateSecret(spec).getEncoded();
-        return new SecretKeySpec(key, "AES");
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/ForwardTenantInterceptor.java

@@ -1,17 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import org.springframework.stereotype.Component;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-
-@Component
-public class ForwardTenantInterceptor implements RequestInterceptor {
-
-    public static final String TENANT_HEADER_NAME = "X-TENANT-ID";
-
-    @Override
-    public void apply(RequestTemplate template) {
-        template.header(TENANT_HEADER_NAME, TenantContext.getTenantId());
-    }
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/MultiTenancyMessagingConfiguration.java

@@ -1,48 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import static com.iqser.red.service.ocr.v1.server.multitenancy.ForwardTenantInterceptor.TENANT_HEADER_NAME;
-
-import org.springframework.amqp.rabbit.config.AbstractRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class MultiTenancyMessagingConfiguration {
-
-    @Bean
-    public static BeanPostProcessor multitenancyBeanPostProcessor() {
-
-        return new BeanPostProcessor() {
-
-            @Override
-            public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-
-                if (bean instanceof RabbitTemplate) {
-
-                    ((RabbitTemplate) bean).setBeforePublishPostProcessors(m -> {
-                        m.getMessageProperties().setHeader(TENANT_HEADER_NAME, TenantContext.getTenantId());
-                        return m;
-                    });
-
-                } else if (bean instanceof AbstractRabbitListenerContainerFactory) {
-
-                    ((AbstractRabbitListenerContainerFactory<?>) bean).setAfterReceivePostProcessors(m -> {
-                        String tenant = m.getMessageProperties().getHeader(TENANT_HEADER_NAME);
-
-                        if (tenant != null) {
-                            TenantContext.setTenantId(tenant);
-                        } else {
-                            throw new RuntimeException("No Tenant is set queue message");
-                        }
-                        return m;
-                    });
-                }
-                return bean;
-            }
-        };
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/MultiTenancyWebConfiguration.java

@@ -1,28 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
-
-@Configuration
-public class MultiTenancyWebConfiguration extends DefaultWebMvcConfiguration {
-
-    private final TenantInterceptor tenantInterceptor;
-
-
-    @Autowired
-    public MultiTenancyWebConfiguration(TenantInterceptor tenantInterceptor) {
-
-        this.tenantInterceptor = tenantInterceptor;
-    }
-
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-
-        registry.addWebRequestInterceptor(tenantInterceptor);
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/StorageConnectionProviderImpl.java

@@ -1,45 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.ocr.v1.server.client.TenantsClient;
-import com.iqser.red.storage.commons.model.AzureStorageConnection;
-import com.iqser.red.storage.commons.model.S3StorageConnection;
-import com.iqser.red.storage.commons.service.StorageConnectionProvider;
-
-import lombok.RequiredArgsConstructor;
-
-@Service
-@RequiredArgsConstructor
-public class StorageConnectionProviderImpl implements StorageConnectionProvider {
-
-    private final TenantsClient tenantsClient;
-    private final EncryptionDecryptionService encryptionDecryptionService;
-
-
-    @Override
-    public AzureStorageConnection getAzureStorageConnection(String tenantId) {
-
-        var tenant = tenantsClient.getTenant(tenantId);
-        return AzureStorageConnection.builder()
-                .connectionString(encryptionDecryptionService.decrypt(tenant.getAzureStorageConnection().getConnectionString()))
-                .containerName(tenant.getAzureStorageConnection().getContainerName())
-                .build();
-    }
-
-
-    @Override
-    public S3StorageConnection getS3StorageConnection(String tenantId) {
-
-        var tenant = tenantsClient.getTenant(tenantId);
-        return S3StorageConnection.builder()
-                .key(tenant.getS3StorageConnection().getKey())
-                .secret(encryptionDecryptionService.decrypt(tenant.getS3StorageConnection().getSecret()))
-                .signerType(tenant.getS3StorageConnection().getSignerType())
-                .bucketName(tenant.getS3StorageConnection().getBucketName())
-                .region(tenant.getS3StorageConnection().getRegion())
-                .endpoint(tenant.getS3StorageConnection().getEndpoint())
-                .build();
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/TenantAwareTaskDecorator.java

@@ -1,23 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import org.springframework.core.task.TaskDecorator;
-import org.springframework.lang.NonNull;
-
-public class TenantAwareTaskDecorator implements TaskDecorator {
-
-    @Override
-    @NonNull
-    public Runnable decorate(@NonNull Runnable runnable) {
-
-        String tenantId = TenantContext.getTenantId();
-        return () -> {
-            try {
-                TenantContext.setTenantId(tenantId);
-                runnable.run();
-            } finally {
-                TenantContext.setTenantId(null);
-            }
-        };
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/TenantContext.java

@@ -1,29 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public final class TenantContext {
-
-    private static InheritableThreadLocal<String> currentTenant = new InheritableThreadLocal<>();
-
-
-    public static void setTenantId(String tenantId) {
-
-        log.debug("Setting tenantId to " + tenantId);
-        currentTenant.set(tenantId);
-    }
-
-
-    public static String getTenantId() {
-
-        return currentTenant.get();
-    }
-
-
-    public static void clear() {
-
-        currentTenant.remove();
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/TenantInterceptor.java

@@ -1,35 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.multitenancy;
-
-import org.springframework.stereotype.Component;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.WebRequestInterceptor;
-
-@Component
-public class TenantInterceptor implements WebRequestInterceptor {
-
-    public static final String TENANT_HEADER_NAME = "X-TENANT-ID";
-
-
-    @Override
-    public void preHandle(WebRequest request) {
-
-        if (request.getHeader(TENANT_HEADER_NAME) != null) {
-            TenantContext.setTenantId(request.getHeader(TENANT_HEADER_NAME));
-        }
-    }
-
-
-    @Override
-    public void postHandle(WebRequest request, ModelMap model) {
-
-        TenantContext.clear();
-    }
-
-
-    @Override
-    public void afterCompletion(WebRequest request, Exception ex) {
-
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/ImagePositionRetrievalService.java

@@ -1,196 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.service;
-
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
-import com.pdftron.common.Matrix2D;
-import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.Element;
-import com.pdftron.pdf.ElementReader;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.Rect;
-import com.pdftron.pdf.RectCollection;
-
-import lombok.SneakyThrows;
-
-@Service
-public class ImagePositionRetrievalService {
-
-    private static final double TOLERANCE = 1e-1;
-
-    // any image with smaller height and width than this gets thrown out, see everyPointInDashedLineIsImage.pdf
-    private static final int PIXEL_THRESHOLD = 10;
-
-
-    /**
-     * Iterates over all elements in a PDF Document and retrieves the bounding box for each image, that is larger than the pixel threshold of 10 in either dimension.
-     * Then it adjusts the bounding boxes for the page rotation.
-     * If the mirrorY flag is set, the Y Coordinates are mirrored and moved up by the page height. This is required for PDFTrons OCRModule.
-     *
-     * @param pdfDoc  a PDF File as PDFTron PDFDoc class
-     * @param mirrorY if this flag is set, all coordinates are calculated with upper left corner as (0,0), else initial user space
-     * @return a map with the page indices as keys and the image bounding boxes on that page as a RectCollection
-     */
-    @SneakyThrows
-    public Map<Integer, RectCollection> getImagePositionPerPage(PDFDoc pdfDoc, boolean mirrorY) {
-
-        Map<Integer, RectCollection> pageIdToImagePositions = new HashMap<>();
-        ElementReader reader = new ElementReader();
-        for (int pageId = 1; pageId <= pdfDoc.getPageCount(); ++pageId) {
-            RectCollection imagePositions = new RectCollection();
-
-            reader.begin(pdfDoc.getPage(pageId));
-            findImagePositionsOnPage(reader, imagePositions, pdfDoc.getPage(pageId), mirrorY);
-            imagePositions = mergeOverlappingRects(imagePositions);
-            reader.end();
-
-            if (imagePositions.getNumRects() > 0) {
-                pageIdToImagePositions.put(pageId, imagePositions);
-            }
-        }
-        reader.destroy();
-        return pageIdToImagePositions;
-    }
-
-
-    private void findImagePositionsOnPage(ElementReader reader, RectCollection imagePositions, Page currentPage, boolean mirrorY) throws PDFNetException {
-
-        Element element;
-        while ((element = reader.next()) != null) {
-            switch (element.getType()) {
-                case Element.e_image, Element.e_inline_image -> {
-                    // see everyPointInDashedLineIsImage.pdf TestFile
-                    if (element.getImageHeight() > PIXEL_THRESHOLD || element.getImageWidth() > PIXEL_THRESHOLD) {
-                        imagePositions.addRect(toRotationAdjustedRect(element.getBBox(), currentPage, mirrorY));
-                    }
-                }
-                case Element.e_form -> {
-                    reader.formBegin();
-                    findImagePositionsOnPage(reader, imagePositions, currentPage, mirrorY);
-                    reader.end();
-                }
-            }
-        }
-    }
-
-
-    @SneakyThrows
-    public RectCollection mergeOverlappingRects(RectCollection imagePositions) {
-
-        if (imagePositions.getNumRects() < 2) {
-            return imagePositions;
-        }
-
-        List<Rectangle2D> rectangleList = toSortedRectangleList(imagePositions);
-
-        mergeRectangleList(rectangleList);
-
-        return toRectCollection(rectangleList);
-    }
-
-
-    // Sometimes images are split up into stripes, here we merge the positions of aligned and intersecting rectangles into one larger rectangle
-    private void mergeRectangleList(List<Rectangle2D> rectangleList) {
-
-        for (int idx = 0; rectangleList.size() >= idx + 2; ) {
-
-            var rect1 = rectangleList.get(idx);
-            var rect2 = rectangleList.get(idx + 1);
-
-            if (intersects(rect1, rect2) && isAlignedXOrY(rect1, rect2)) {
-                rectangleList.remove(idx + 1);
-                rectangleList.remove(idx);
-                rectangleList.add(idx, rect1.createUnion(rect2));
-            } else {
-                ++idx;
-            }
-        }
-    }
-
-
-    private boolean intersects(Rectangle2D rect1, Rectangle2D rect2) {
-
-        return rect1.intersects(rect2.getMinX() - TOLERANCE, rect2.getMinY() - TOLERANCE, rect2.getWidth() + (2 * TOLERANCE), rect2.getHeight() + (2 * TOLERANCE));
-    }
-
-
-    private boolean isAlignedXOrY(Rectangle2D rect1, Rectangle2D rect2) {
-
-        boolean isAlignedX = Math.abs(rect1.getMinX() - rect2.getMinX()) < TOLERANCE && Math.abs(rect1.getMaxX() - rect2.getMaxX()) < TOLERANCE;
-        boolean isAlignedY = Math.abs(rect1.getMinY() - rect2.getMinY()) < TOLERANCE && Math.abs(rect1.getMaxY() - rect2.getMaxY()) < TOLERANCE;
-
-        return isAlignedX || isAlignedY;
-    }
-
-
-    private Rect toRotationAdjustedRect(Rect bbox, Page page, boolean mirrorY) throws PDFNetException {
-
-        int rotation = page.getRotation();
-        double height = page.getPageHeight();
-        double width = page.getPageWidth();
-
-        // Even though PDFTron almost always has the origin in the lower left corner, for some reason, the OCRModule's addTextZonesForPage() uses the upper left corner as origin...
-        Matrix2D mirrorMatrix;
-        if (mirrorY) {
-            mirrorMatrix = new Matrix2D(1, 0, 0, -1, 0, height);
-        } else {
-            mirrorMatrix = new Matrix2D();
-        }
-
-        // We need to rotate the rects to fit to the page rotation
-        Matrix2D rotationMatrix = switch (rotation) {
-            case 1 -> new Matrix2D(0, -1, 1, 0, 0, height);
-            case 2 -> new Matrix2D(-1, 0, 0, -1, width, height);
-            case 3 -> new Matrix2D(0, 1, -1, 0, width, 0);
-            default -> new Matrix2D();
-        };
-
-        Matrix2D finalMatrix = mirrorMatrix.multiply(rotationMatrix);
-
-        Point2D.Double p1 = finalMatrix.multPoint(bbox.getX1(), bbox.getY1());
-        Point2D.Double p2 = finalMatrix.multPoint(bbox.getX2(), bbox.getY2());
-
-        // PDFTron Rect *needs* lower left and upper right coordinates to calculate width and height correctly, even though the documentation states otherwise
-        Point2D.Double lowerLeft = new Point2D.Double(Math.min(p1.x, p2.x), Math.min(p1.y, p2.y));
-        Point2D.Double upperRight = new Point2D.Double(Math.max(p1.x, p2.x), Math.max(p1.y, p2.y));
-
-        return new Rect(lowerLeft.x, lowerLeft.y, upperRight.x, upperRight.y);
-    }
-
-
-    private RectCollection toRectCollection(List<Rectangle2D> rectangleList) {
-
-        RectCollection rectCollection = new RectCollection();
-        rectangleList.forEach(r -> {
-            try {
-                rectCollection.addRect(new Rect(r.getMinX(), r.getMinY(), r.getMaxX(), r.getMaxY()));
-            } catch (PDFNetException e) {
-                throw new RuntimeException(e);
-            }
-        });
-        return rectCollection;
-    }
-
-
-    @SneakyThrows
-    private List<Rectangle2D> toSortedRectangleList(RectCollection rectCollection) {
-
-        List<Rectangle2D> list = new LinkedList<>();
-        for (int i = 0; i < rectCollection.getNumRects(); ++i) {
-            Rect r = rectCollection.getRectAt(i);
-            list.add(new Rectangle2D.Double(r.getX1(), r.getY1(), r.getWidth(), r.getHeight()));
-        }
-        list.sort(Comparator.comparingDouble(RectangularShape::getMinY).thenComparing(RectangularShape::getMinX));
-        return list;
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/InvisibleElementRemovalService.java

@@ -1,466 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.service;
-
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.springframework.stereotype.Service;
-
-import com.google.common.primitives.Bytes;
-import com.google.common.primitives.Doubles;
-import com.iqser.red.service.ocr.v1.server.model.ClippingPathStack;
-import com.iqser.red.service.ocr.v1.server.model.ElementFeatures;
-import com.pdftron.common.Matrix2D;
-import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.ColorPt;
-import com.pdftron.pdf.ColorSpace;
-import com.pdftron.pdf.Element;
-import com.pdftron.pdf.ElementBuilder;
-import com.pdftron.pdf.ElementReader;
-import com.pdftron.pdf.ElementWriter;
-import com.pdftron.pdf.GState;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.PageIterator;
-import com.pdftron.pdf.PathData;
-import com.pdftron.pdf.Rect;
-import com.pdftron.sdf.Obj;
-import com.pdftron.sdf.SDFDoc;
-
-import lombok.Builder;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-public class InvisibleElementRemovalService {
-
-    static public final double TOLERANCE = 1e-3;
-
-
-    /**
-     * Removes all hidden Text, Path and Image Elements from a PDF Document.
-     * handled cases:
-     * -Text which is transparent or is set to not render
-     * -Elements outside of clipping path
-     * -Elements that have been painted over by visible and filled Paths
-     * unhandled cases:
-     * -Elements covered by widely stroked path
-     * -Elements with the same color as background
-     * -Any Text set to clipping with its many interactions with other elements
-     *
-     * @param pdfFile The PDF file to process
-     * @param delta   If this flag is set only the removed Elements will be written to the output file.
-     *                The Elements are red if they are removed by clipping path, blue for transparency, and a green bounding box for overlap.
-     * @param out     OutputStream to write the resulting file to
-     **/
-    @SneakyThrows
-    public void removeInvisibleElements(InputStream pdfFile, OutputStream out, boolean delta) {
-
-        PDFDoc pdfDoc = new PDFDoc(pdfFile);
-
-        ElementWriter writer = new ElementWriter();
-        ElementReader reader = new ElementReader();
-        Set<Long> visitedXObjIds = new TreeSet<>();
-
-        for (PageIterator iterator = pdfDoc.getPageIterator(); iterator.hasNext(); ) {
-
-            Page page = iterator.next();
-
-            visitedXObjIds.add(page.getSDFObj().getObjNum());
-
-
-            InvisibleElementRemovalContext context = InvisibleElementRemovalContext.builder()
-                    .reader(reader)
-                    .clippingPathStack(new ClippingPathStack(page.getMediaBox()))
-                    .delta(delta)
-                    .overlappedElements(new ArrayList<>())
-                    .visibleElements(new ArrayList<>())
-                    .visitedXObjIds(visitedXObjIds)
-                    .build();
-
-            removeClippedElementsAndInvisibleTextAndRememberOverlappedElements(page, writer, context);
-
-            context.visitedXObjIds().clear();
-
-            removeOverlappedElements(page, writer, context);
-        }
-
-        try {
-            pdfDoc.save(out, SDFDoc.SaveMode.LINEARIZED, null);
-        } catch (Exception e) {
-            log.error("File could not be saved after invisible element removal");
-            throw new RuntimeException(e);
-        }
-
-        writer.destroy();
-        reader.destroy();
-        pdfDoc.close();
-    }
-
-
-    private void removeClippedElementsAndInvisibleTextAndRememberOverlappedElements(Page page,
-                                                                                    ElementWriter writer,
-                                                                                    InvisibleElementRemovalContext context) throws PDFNetException {
-
-        context.reader().begin(page);
-        writer.begin(page, ElementWriter.e_replacement, false, true, page.getResourceDict());
-        processElements(writer, context);
-        writer.end();
-        context.reader().end();
-    }
-
-
-    private void processElements(ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        for (Element element = context.reader().next(); element != null; element = context.reader().next())
-            switch (element.getType()) {
-                case Element.e_image, Element.e_inline_image -> processImages(element, writer, context);
-                case Element.e_text -> processText(element, writer, context);
-                case Element.e_path -> processPath(element, writer, context);
-                case Element.e_form -> processForm(element, writer, context);
-                case Element.e_group_begin -> {
-                    context.clippingPathStack().enterNewGState();
-                    writer.writeElement(element);
-                }
-                case Element.e_group_end -> {
-                    context.clippingPathStack().leaveGState();
-                    writer.writeElement(element);
-                }
-                default -> writer.writeElement(element);
-            }
-    }
-
-
-    private void processImages(Element imageElement, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        Rect rect = imageElement.getBBox();
-
-        if (rect == null) {
-            return;
-        }
-
-        boolean inClippingPath = context.clippingPathStack().almostIntersects(rect.getX1(), rect.getY1(), rect.getWidth(), rect.getHeight());
-
-        if (!context.delta() && inClippingPath) {
-            context.visibleElements().add(ElementFeatures.extractFeatures(imageElement));
-        }
-
-        if (context.delta() ^ inClippingPath) {
-            writer.writeElement(imageElement);
-        }
-    }
-
-
-    private void processText(Element textElement, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        Rect rect = textElement.getBBox();
-
-        if (rect == null) {
-            writer.writeElement(textElement);
-            return;
-        }
-
-        GState gState = textElement.getGState();
-
-        boolean inClippingPath = context.clippingPathStack().almostIntersects(rect.getX1(), rect.getY1(), rect.getWidth(), rect.getHeight());
-
-        boolean isTextVisible = isTextRenderedVisibly(gState);
-
-        if (inClippingPath && isTextVisible) {
-            context.visibleElements().add(ElementFeatures.extractFeatures(textElement));
-        }
-        if (!context.delta()) {
-            if (inClippingPath && isTextVisible) {
-                writer.writeElement(textElement);
-            } else if (textElement.hasTextMatrix()) {
-                /*
-                PDFTron Element with type "text" refers to a Tj command. If a Tm command is just above it in the pdf file, PDFTron will join the two commands and treat them as one Element.
-                hasTextMatrix() checks for this case specifically. Also, Tm changes the position for a whole BT/ET segment, possibly containing multiple Tj commands.
-                Therefore, the position of a following Tj is affected by not writing the first Element.
-                This is why, we write only the Tm command:
-                */
-                writer.writeGStateChanges(textElement);
-            }
-        } else {
-            if (!inClippingPath) {
-                gState.setFillColorSpace(ColorSpace.createDeviceRGB());
-                // red for elements removed by clipping path
-                gState.setFillColor(new ColorPt(1, 0, 0));
-                writer.writeElement(textElement);
-            }
-            if (!isTextVisible) {
-                gState.setFillColorSpace(ColorSpace.createDeviceRGB());
-                // blue for elements removed due to transparency or not rendered
-                gState.setFillColor(new ColorPt(0, 0, 1));
-                gState.setTextRenderMode(GState.e_fill_text);
-                gState.setFillOpacity(1);
-                writer.writeElement(textElement);
-            }
-        }
-    }
-
-
-    private void processForm(Element formElement, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        writer.writeElement(formElement);
-        Obj formObj = formElement.getXObject();
-
-        if (!context.visitedXObjIds().contains(formObj.getObjNum())) {
-            context.visitedXObjIds().add(formObj.getObjNum());
-            // writer needs to be newly initialized when entering a new content stream
-            // see ElementEditTest in PDFTron (https://www.pdftron.com/documentation/samples/android/java/ElementEditTest)
-            ElementWriter formWriter = new ElementWriter();
-            context.reader().formBegin();
-            formWriter.begin(formObj);
-
-            context.reader().clearChangeList();
-            formWriter.setDefaultGState(context.reader());
-
-            processElements(formWriter, context);
-            formWriter.end();
-            formWriter.destroy();
-            context.reader().end();
-        }
-    }
-
-
-    private void processPath(Element pathElement, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        PathData pathData = pathElement.getPathData();
-
-        if (pathData.getOperators().length == 0 && pathData.getPoints().length == 0) {
-            writer.writeGStateChanges(pathElement);
-            return;
-        }
-
-        GeneralPath linePath = convertToGeneralPath(pathData);
-
-        //transform path to initial user space
-        var ctm = pathElement.getCTM();
-        var affineTransform = toAffineTransform(ctm);
-        linePath.transform(affineTransform);
-
-        var rect = linePath.getBounds2D();
-
-        boolean inClippingPath = context.clippingPathStack().almostIntersects(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
-
-        if (pathElement.isClippingPath()) {
-            if (pathElement.isClipWindingFill()) {
-                linePath.setWindingRule(GeneralPath.WIND_NON_ZERO);
-            } else {
-                linePath.setWindingRule(GeneralPath.WIND_EVEN_ODD);
-            }
-
-            context.clippingPathStack().intersectClippingPath(linePath);
-            pathElement.setPathClip(!context.delta());
-            writer.writeElement(pathElement);
-
-        } else {
-            if (pathElement.isWindingFill()) {
-                linePath.setWindingRule(GeneralPath.WIND_NON_ZERO);
-            } else {
-                linePath.setWindingRule(GeneralPath.WIND_EVEN_ODD);
-            }
-
-            if (inClippingPath) {
-                if (isFilledAndNonTransparent(pathElement)) {
-                    List<ElementFeatures> currentOverlappedElements = context.visibleElements()
-                            .stream()
-                            .filter(features -> almostContains(linePath, features.getBoundingBox()))
-                            .toList();
-                    context.overlappedElements().addAll(currentOverlappedElements);
-                    context.visibleElements().removeAll(currentOverlappedElements);
-                }
-                context.visibleElements().add(ElementFeatures.extractFeatures(pathElement));
-                if (!context.delta()) {
-                    writer.writeElement(pathElement);
-                }
-            }
-            if (context.delta() && !inClippingPath) {
-                pathElement.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
-                pathElement.getGState().setFillColor(new ColorPt(1, 0, 0));
-                pathElement.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
-                pathElement.getGState().setStrokeColor(new ColorPt(1, 0, 0));
-                writer.writeElement(pathElement);
-            }
-        }
-    }
-
-
-    private void removeOverlappedElements(Page page, ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        context.reader().begin(page);
-        writer.begin(page, ElementWriter.e_replacement, false, true, page.getResourceDict());
-        if (context.delta()) {
-            // green for element removed due to overlapping
-            context.overlappedElements().forEach(feature -> drawBBox(writer, feature.getBoundingBox(), "#00FF00"));
-            context.overlappedElements().clear();
-        }
-        processOverlappedElements(writer, context);
-        writer.end();
-        context.reader().end();
-
-        if (context.overlappedElements().size() > 0) {
-            log.warn(context.overlappedElements().size() + " overlapped elements have not been found or removed");
-        }
-    }
-
-
-    private void processOverlappedElements(ElementWriter writer, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        for (Element element = context.reader().next(); element != null; element = context.reader().next()) {
-            switch (element.getType()) {
-                case Element.e_form -> processFormOverlappedElements(writer, element, context);
-                case Element.e_path, Element.e_image, Element.e_inline_image, Element.e_text -> {
-                    boolean anyMatch = false;
-                    for (ElementFeatures elementToRemove : context.overlappedElements()) {
-                        if (elementToRemove.almostMatches(element)) {
-                            context.overlappedElements().remove(elementToRemove);
-                            anyMatch = true;
-                            break;
-                        }
-                    }
-                    if (!anyMatch) {
-                        writer.writeElement(element);
-                    } else if (element.getType() == 3 && element.hasTextMatrix()) {
-                        /*
-                        PDFTron Element with type "text" refers to a Tj command. If a Tm command is just above it in the pdf file, PDFTron will join the two commands and treat them as one Element.
-                        hasTextMatrix() checks for this case specifically. Also, Tm changes the position for a whole BT/ET segment, possibly containing multiple Tj commands.
-                        Therefore, the position of a following Tj is affected by not writing the first Element.
-                        This is why, we write only the Tm command:
-                        */
-                        writer.writeGStateChanges(element);
-                    }
-                }
-                default -> writer.writeElement(element);
-            }
-        }
-    }
-
-
-    private void processFormOverlappedElements(ElementWriter writer, Element formElement, InvisibleElementRemovalContext context) throws PDFNetException {
-
-        writer.writeElement(formElement);
-        Obj formObj = formElement.getXObject();
-
-        if (!context.visitedXObjIds().contains(formObj.getObjNum())) {
-            context.visitedXObjIds().add(formObj.getObjNum());
-            // writer needs to be newly initialized when entering a new content stream
-            // see ElementEditTest in PDFTron (https://www.pdftron.com/documentation/samples/android/java/ElementEditTest)
-            ElementWriter formWriter = new ElementWriter();
-            context.reader().formBegin();
-            formWriter.begin(formObj);
-
-            context.reader().clearChangeList();
-            formWriter.setDefaultGState(context.reader());
-
-            processOverlappedElements(formWriter, context);
-            formWriter.end();
-            formWriter.destroy();
-            context.reader().end();
-        }
-    }
-
-
-    private boolean isTextRenderedVisibly(GState gState) throws PDFNetException {
-
-        return gState.getTextRenderMode() != GState.e_invisible_text && //
-                !(gState.getTextRenderMode() == GState.e_fill_text && gState.getFillOpacity() == 0) && //
-                !(gState.getTextRenderMode() == GState.e_stroke_text && gState.getStrokeOpacity() == 0) && //
-                !(gState.getTextRenderMode() == GState.e_fill_stroke_text && gState.getFillOpacity() == 0 && gState.getStrokeOpacity() == 0);
-    }
-
-
-    private GeneralPath convertToGeneralPath(PathData pathData) throws PDFNetException {
-
-        GeneralPath linePath = new GeneralPath();
-        Iterator<Double> points = Doubles.asList(pathData.getPoints()).iterator();
-        Iterable<Byte> operators = Bytes.asList(pathData.getOperators());
-        for (var operator : operators) {
-            switch (operator) {
-                case PathData.e_moveto -> linePath.moveTo(points.next(), points.next());
-                case PathData.e_lineto -> linePath.lineTo(points.next(), points.next());
-                case PathData.e_cubicto -> linePath.curveTo(points.next(), points.next(), points.next(), points.next(), points.next(), points.next());
-                case PathData.e_closepath -> linePath.closePath();
-                case PathData.e_rect -> {
-                    double x = points.next();
-                    double y = points.next();
-                    double w = points.next();
-                    double h = points.next();
-                    linePath.moveTo(x, y);
-                    linePath.lineTo(x + w, y);
-                    linePath.lineTo(x + w, y + h);
-                    linePath.lineTo(x, y + h);
-                    linePath.closePath();
-                }
-                default -> throw new PDFNetException("Invalid Element Type", 0, "", "", "");
-            }
-        }
-        return linePath;
-    }
-
-
-    private boolean almostContains(Shape outer, Rectangle2D inner) {
-        //To address inconsistencies in the calculation of the bounding box we slightly shrink the inner rectangle
-
-        double x_with_tolerance = inner.getX() >= 0 ? inner.getX() + TOLERANCE : inner.getX() - TOLERANCE;
-        double y_with_tolerance = inner.getY() >= 0 ? inner.getY() + TOLERANCE : inner.getY() - TOLERANCE;
-        double height_with_tolerance = inner.getHeight() - (2 * TOLERANCE);
-        double width_with_tolerance = inner.getWidth() - (2 * TOLERANCE);
-        Rectangle2D innerRect = new Rectangle2D.Double(x_with_tolerance, y_with_tolerance, width_with_tolerance, height_with_tolerance);
-
-        return outer.contains(innerRect);
-    }
-
-
-    private boolean isFilledAndNonTransparent(Element element) throws PDFNetException {
-
-        return element.isFilled() && element.getGState().getFillOpacity() == 1;
-    }
-
-
-    @SneakyThrows
-    private void drawBBox(ElementWriter writer, Rectangle2D r, String hexcolor) {
-
-        ColorPt colorPt = new ColorPt(Integer.valueOf(hexcolor.substring(1, 3), 16) / 255d,
-                Integer.valueOf(hexcolor.substring(3, 5), 16) / 255d,
-                Integer.valueOf(hexcolor.substring(5, 7), 16) / 255d);
-        ElementBuilder eb = new ElementBuilder();
-        Element rect = eb.createRect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
-        rect.setPathStroke(true);
-        rect.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
-        rect.getGState().setStrokeColor(colorPt);
-        writer.writePlacedElement(rect);
-
-        colorPt.destroy();
-        eb.destroy();
-    }
-
-
-    private static AffineTransform toAffineTransform(Matrix2D ctm) throws PDFNetException {
-
-        return new AffineTransform(ctm.getA(), ctm.getB(), ctm.getC(), ctm.getD(), ctm.getH(), ctm.getV());
-    }
-
-
-    @Builder
-    private record InvisibleElementRemovalContext(
-            boolean delta,
-            ElementReader reader,
-            ClippingPathStack clippingPathStack,
-            List<ElementFeatures> overlappedElements,
-            List<ElementFeatures> visibleElements,
-            Set<Long> visitedXObjIds) {
-
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OCRService.java

@@ -1,197 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.service;
-
-import static java.lang.String.format;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.ocr.v1.api.model.OCRStatusUpdateResponse;
-import com.iqser.red.service.ocr.v1.server.configuration.MessagingConfiguration;
-import com.iqser.red.service.ocr.v1.server.settings.OcrServiceSettings;
-import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.OCRModule;
-import com.pdftron.pdf.OCROptions;
-import com.pdftron.pdf.Optimizer;
-import com.pdftron.pdf.PDFDoc;
-import com.pdftron.pdf.Page;
-import com.pdftron.pdf.RectCollection;
-import com.pdftron.sdf.SDFDoc;
-
-import io.micrometer.core.annotation.Timed;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class OCRService {
-
-    public static final String ENGLISH = "eng";
-
-    private final FileStorageService fileStorageService;
-    private final OcrServiceSettings settings;
-
-    private final RabbitTemplate rabbitTemplate;
-
-    private final ObjectMapper objectMapper;
-
-    private final InvisibleElementRemovalService invisibleElementRemovalService;
-
-    private final ImagePositionRetrievalService imagePositionRetrievalService;
-
-
-    /**
-     * First loads the PDF Document from storage.
-     * Then removes all invisible Elements from the PDF, check InvisibleElementRemovalService for details.
-     * Then gets Image Position Information, check ImagePositionRetrievalService for details.
-     * Then runs OCR page by page, exclusively on pages which have images on them. It does so, by creating a new PDFDoc and inserting a single page at a time.
-     * This is because PDFTron OCROptions overlays all regions where OCR should not be run with white images. It does not check for empty pages.
-     * For Documents with many pages but few Images this results in major performance improvements.
-     * It then re-adds the OCRed Pages to the original document and saves it.
-     *
-     * @param dossierId The dossier id
-     * @param fileId    The file id
-     * @param out       OutputStream to write the file to
-     */
-    @Timed("redactmanager_runOcrOnDocument")
-    public void runOcrOnDocument(String dossierId, String fileId, OutputStream out) throws IOException {
-
-        try (ByteArrayOutputStream transferOutputStream = new ByteArrayOutputStream()) {
-            try (InputStream fileStream = fileStorageService.getOriginalFileAsStream(dossierId, fileId)) {
-                long removalStart = System.currentTimeMillis();
-                log.debug("Start invisible element removal for file with dossierId {} and fileId {}", dossierId, fileId);
-                invisibleElementRemovalService.removeInvisibleElements(fileStream, transferOutputStream, false);
-                long removalEnd = System.currentTimeMillis();
-                log.debug("Invisible element removal successful for file with dossierId {} and fileId {}, took {}s",
-                        dossierId,
-                        fileId,
-                        format("%.1f", (removalEnd - removalStart) / 1000.0));
-            }
-            try (InputStream transferInputStream = new ByteArrayInputStream(transferOutputStream.toByteArray())) {
-                long ocrStart = System.currentTimeMillis();
-                runOcr(transferInputStream, out, fileId);
-                long ocrEnd = System.currentTimeMillis();
-                log.info("ocr successful for file with dossierId {} and fileId {}, took {}s", dossierId, fileId, format("%.1f", (ocrEnd - ocrStart) / 1000.0));
-            }
-        }
-    }
-
-
-    @SneakyThrows
-    private void runOcr(InputStream fileStream, OutputStream out, String fileId) {
-
-        PDFDoc pdfDoc = new PDFDoc(fileStream);
-
-        Map<Integer, RectCollection> pageIdToRectCollection = imagePositionRetrievalService.getImagePositionPerPage(pdfDoc, true);
-        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder().fileId(fileId).numberOfPagesToOCR(pageIdToRectCollection.size()).build()));
-
-        // Optimization:
-        // When a page does not have a TextZone, PDFTron whites out the page. But, PDFTron scans it anyway, resulting in a longer runtime.
-        // So, we need to remove pages without images.
-        // Furthermore, creating a new document is *much* faster than reusing the same document and adding/removing pages one by one.
-        // Therefore, we create a new Document with a single page for every page that contains an image.
-        // For some reason, if we insert the OCR singlePageDoc into the original PDFDoc inside the loop, for some documents, the RAM Usage increases exponentially with every page.
-        // This is why, we replace the OCRed Pages outside the main loop.
-        int numProcessedPages = 0;
-        Map<Integer, PDFDoc> pageIdToSinglePagePdfDoc = new HashMap<>();
-        for (Integer pageId : pageIdToRectCollection.keySet()) {
-            try {
-                PDFDoc singlePagePdfDoc = extractSinglePagePdfDoc(pdfDoc, pageId);
-                processOcr(pageIdToRectCollection, pageId, singlePagePdfDoc);
-
-                log.info("{}/{} Page {} done, OCR regions {}",
-                        numProcessedPages,
-                        pageIdToRectCollection.size(),
-                        pageId,
-                        getAllOcrTextZonesAsString(pageIdToRectCollection, pageId));
-
-                pageIdToSinglePagePdfDoc.put(pageId, singlePagePdfDoc);
-                ++numProcessedPages;
-
-                rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                        objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder()
-                                .fileId(fileId)
-                                .numberOfPagesToOCR(pageIdToRectCollection.size())
-                                .numberOfOCRedPages(numProcessedPages)
-                                .build()));
-
-            } catch (PDFNetException e) {
-                log.error("Failed to process page {}", pageId);
-                throw new RuntimeException(e);
-            }
-        }
-        log.info("Copying {} OCRed Pages into original Document", pageIdToSinglePagePdfDoc.size());
-        pageIdToSinglePagePdfDoc.forEach((pageId, singlePagePdfDoc) -> replaceOriginalPageWithOcrPage(pdfDoc, pageId, singlePagePdfDoc));
-        Optimizer.optimize(pdfDoc);
-
-        rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder()
-                        .fileId(fileId)
-                        .numberOfPagesToOCR(pageIdToRectCollection.size())
-                        .numberOfOCRedPages(numProcessedPages)
-                        .ocrFinished(true)
-                        .build()));
-
-        try {
-            pdfDoc.save(out, SDFDoc.SaveMode.LINEARIZED, null);
-        } catch (Exception e) {
-            log.error("Processed File with fileId {} could not be saved", fileId);
-            throw new RuntimeException(e);
-        }
-        pdfDoc.close();
-    }
-
-
-    private void processOcr(Map<Integer, RectCollection> pageIdToRectCollection, Integer pageId, PDFDoc singlePagePdfDoc) throws PDFNetException {
-
-        OCROptions options = new OCROptions();
-        options.addTextZonesForPage(pageIdToRectCollection.get(pageId), 1);
-        options.addLang(ENGLISH);
-        options.addDPI(settings.getOcrDPI());
-
-        OCRModule.processPDF(singlePagePdfDoc, options);
-    }
-
-
-    private static PDFDoc extractSinglePagePdfDoc(PDFDoc pdfDoc, Integer pageId) throws PDFNetException {
-
-        PDFDoc singlePagePdfDoc = new PDFDoc();
-        Page page = pdfDoc.getPage(pageId);
-        page.setMediaBox(page.getCropBox()); // this line ensures the ocr text is placed correctly by PDFTron, see TestFile MediaBoxBiggerThanCropBox.pdf
-        singlePagePdfDoc.pagePushBack(page);
-        return singlePagePdfDoc;
-    }
-
-
-    @SneakyThrows
-    private static void replaceOriginalPageWithOcrPage(PDFDoc pdfDoc, Integer pageId, PDFDoc singlePagePdfDoc) {
-
-        Page ocrPage = singlePagePdfDoc.getPage(1);
-        pdfDoc.pageInsert(pdfDoc.getPageIterator(pageId), ocrPage);
-        pdfDoc.pageRemove(pdfDoc.getPageIterator(pageId + 1));
-        singlePagePdfDoc.close();
-    }
-
-
-    private static StringBuilder getAllOcrTextZonesAsString(Map<Integer, RectCollection> pageIdToRectCollection, Integer pageId) throws PDFNetException {
-
-        StringBuilder zonesString = new StringBuilder();
-        for (int j = 0; j < pageIdToRectCollection.get(pageId).getNumRects(); ++j) {
-            var r = pageIdToRectCollection.get(pageId).getRectAt(j);
-            zonesString.append(format("[lower left (%.1f|%.1f) upper right (%.1f|%.1f)]", r.getX1(), r.getY1(), r.getX2(), r.getY2()));
-        }
-        return zonesString;
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java

@@ -1,84 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.ocr.v1.api.model.DocumentRequest;
-import com.iqser.red.service.ocr.v1.server.client.FileStatusProcessingUpdateClient;
-import com.iqser.red.service.ocr.v1.server.configuration.MessagingConfiguration;
-import com.iqser.red.service.ocr.v1.server.initializer.PDFNetInitializer;
-import feign.FeignException;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.AmqpRejectAndDontRequeueException;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class OcrMessageReceiver {
-
-    private final ObjectMapper objectMapper;
-    private final FileStorageService fileStorageService;
-    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
-
-    private final OCRService ocrService;
-
-
-    @RabbitHandler
-    @RabbitListener(queues = MessagingConfiguration.OCR_QUEUE, concurrency = "1")
-    public void receiveOcr(String in) throws JsonProcessingException {
-
-        DocumentRequest ocrRequestMessage = objectMapper.readValue(in, DocumentRequest.class);
-
-        log.info("Start ocr for file with dossierId {} and fileId {}", ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-
-        setStatusOcrProcessing(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-
-        if (!fileStorageService.untouchedFileExists(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId())) {
-            byte[] originalFile = fileStorageService.getOriginalFile(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-            fileStorageService.storeUntouchedFile(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), originalFile);
-        }
-
-        try (var transferStream = new ByteArrayOutputStream()) {
-            ocrService.runOcrOnDocument(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), transferStream);
-            try (var inputStream = new ByteArrayInputStream(transferStream.toByteArray())) {
-                fileStorageService.storeOriginalFile(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), inputStream);
-            }
-        } catch (IOException e) {
-            log.error("Failed to store file with dossierId {} and fileId {}", ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-            throw new RuntimeException(e);
-        }
-
-        fileStatusProcessingUpdateClient.ocrSuccessful(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-    }
-
-
-    @RabbitHandler
-    @RabbitListener(queues = MessagingConfiguration.OCR_DLQ, concurrency = "1")
-    public void receiveOcrDQL(String in) throws JsonProcessingException {
-
-        DocumentRequest ocrRequestMessage = objectMapper.readValue(in, DocumentRequest.class);
-        log.info("OCR DQL received: {}", ocrRequestMessage);
-        fileStatusProcessingUpdateClient.ocrFailed(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-    }
-
-
-    private void setStatusOcrProcessing(String dossierId, String fileId) {
-
-        try {
-            fileStatusProcessingUpdateClient.ocrProcessing(dossierId, fileId);
-        } catch (FeignException e) {
-            if (e.status() == HttpStatus.CONFLICT.value()) {
-                throw new AmqpRejectAndDontRequeueException(e.getMessage());
-            }
-        }
-    }
-
-}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/settings/OcrServiceSettings.java

@@ -1,14 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.settings;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import lombok.Data;
-
-@Data
-@ConfigurationProperties("ocr-service")
-public class OcrServiceSettings {
-
-    private int ocrDPI = 300;
-    private boolean removeWatermark;
-
-}

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

@@ -1,10 +0,0 @@
-server:
-  port: 8086
-
-persistence-service.url: "http://persistence-service-v1:8080"
-
-storage:
-  bucket-name: 'redaction'
-  endpoint: 'http://localhost:9000'
-  key: minioadmin
-  secret: minioadmin