hotfix: readded fallback if files are stored uncompressed

Merge branch 'RED-7012-361' into 'release/1.14.x'
RED-7012: changed writeGStateChanges with writeElement in method processPath... See merge request redactmanager/ocr-service!12
2023-10-26 14:35:07 +02:00 · 2023-07-18 08:21:36 +02:00 · 2023-07-18 08:18:23 +02:00 · 2023-07-14 09:07:32 +02:00 · 2023-06-30 14:34:13 +02:00 · 2023-06-27 11:14:19 +02:00
40 changed files with 848 additions and 758 deletions
@@ -0,0 +1,6 @@
+variables:
+  SONAR_PROJECT_KEY: 'LM_license-service'
+include:
+  - project: 'gitlab/gitlab'
+    ref: 'main'
+    file: 'ci-templates/maven_java.yml'
@@ -1,37 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.atlassian.bamboo</groupId>
-        <artifactId>bamboo-specs-parent</artifactId>
-        <version>8.1.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>bamboo-specs</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.atlassian.bamboo</groupId>
-            <artifactId>bamboo-specs-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.atlassian.bamboo</groupId>
-            <artifactId>bamboo-specs</artifactId>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-
-    <!-- run 'mvn test' to perform offline validation of the plan -->
-    <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>
@@ -1,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());
-    }
-
-}
@@ -1,62 +0,0 @@
-#!/bin/bash
-set -e
-
-SERVICE_NAME=$1
-
-if [[ "$bamboo_planRepository_branchName" == "master" ]]
-then
-    branchVersion=$(cat pom.xml | grep -Eo "    <version>.*-SNAPSHOT</version>" | sed -s 's|<version>\(.*\)\..*\(-*.*\)</version>|\1|' | tr -d ' ')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i minor)"
-    echo "new release on master with version $newVersion"
-elif [[ "$bamboo_planRepository_branchName" == release* ]]
-then
-    branchVersion=$(echo $bamboo_planRepository_branchName | sed -s 's|release\/\([0-9]\+\.[0-9]\+\)\.x|\1|')
-    latestVersion=$( semver $(git tag -l "${branchVersion}.*" ) | tail -n1 )
-    newVersion="$(semver $latestVersion -p -i patch)"
-    echo "new release on $bamboo_planRepository_branchName with version $newVersion"
-elif [[ "${bamboo_version_tag}" != "dev" ]]
-then
-    newVersion="${bamboo_version_tag}"
-    echo "new special version bild with $newVersion"
-else
-    mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        --no-transfer-progress \
-        ${bamboo_maven_add_param} \
-        clean install \
-        -Djava.security.egd=file:/dev/./urandomelse
-    echo "dev build with tag ${bamboo_planRepository_1_branch}_${bamboo_buildNumber}"
-    echo "gitTag=${bamboo_planRepository_1_branch}_${bamboo_buildNumber}" > git.tag
-    exit 0
-fi
-
-echo "gitTag=${newVersion}" > git.tag
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    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.knecon.com/repository/red-platform-releases
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    package
-
-mvn --no-transfer-progress \
-    -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
-    docker:push
@@ -1,45 +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 \
-    -DknownExploitedEnabled=false
-
-if [[ -z "${bamboo_repository_pr_key}" ]]
-then
-    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-else
-    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
-    mvn --no-transfer-progress \
-        -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-        sonar:sonar \
-        -Dsonar.projectKey=RED_$SERVICE_NAME \
-        -Dsonar.host.url=https://sonarqube.iqser.com \
-        -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-        -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-        -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-        -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-        -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-        -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-        -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-fi
@@ -1,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);
-
-    }
-
-}
@@ -12,7 +12,7 @@

    <artifactId>ocr-service-image-v1</artifactId>
    <groupId>com.iqser.red.service</groupId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
@@ -7,17 +7,27 @@
    <parent>
        <groupId>com.iqser.red.service</groupId>
        <artifactId>ocr-service-v1</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <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>
+        <persistence-service.version>1.269.0</persistence-service.version>
+        <redaction-service.version>3.155.0</redaction-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. -->
@@ -33,9 +43,26 @@

        <dependency>
            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-internal-api-v1</artifactId>
+            <artifactId>persistence-service-api-v1</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>redaction-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
            <version>${persistence-service.version}</version>
        </dependency>
+        <dependency>
+            <groupId>com.iqser.red.service</groupId>
+            <artifactId>redaction-service-api-v1</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.iqser.red.service</groupId>
+                    <artifactId>persistence-service-api-v1</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>${redaction-service.version}</version>
+        </dependency>

    </dependencies>
 </project>
@@ -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);
-    }
-
-}
-
@@ -7,10 +7,11 @@
    <parent>
        <groupId>com.iqser.red.service</groupId>
        <artifactId>ocr-service-v1</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
    </parent>

    <artifactId>ocr-service-server-v1</artifactId>
+    <version>1.0-SNAPSHOT</version>

    <dependencies>
        <dependency>
@@ -22,13 +23,8 @@
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>storage-commons</artifactId>
+            <version>1.8.5</version>
        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.commons</groupId>
-            <artifactId>pdftron-logic-commons</artifactId>
-            <version>2.1.0</version>
-        </dependency>
-
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
            <artifactId>spring-commons</artifactId>
@@ -44,16 +40,17 @@
        <dependency>
            <groupId>com.pdftron</groupId>
            <artifactId>PDFNet</artifactId>
-            <version>2023-05-24_experimental</version>
+            <version>10.1.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.440</version>
+            <version>1.12.158</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
@@ -69,6 +66,7 @@
        <dependency>
            <groupId>org.springframework.amqp</groupId>
            <artifactId>spring-rabbit-test</artifactId>
+            <version>2.3.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -84,6 +82,7 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
        </dependency>
    </dependencies>
    <build>
@@ -112,6 +111,7 @@
                <configuration>
                    <annotationProcessors>
                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
                    </annotationProcessors>
                </configuration>
            </plugin>
@@ -10,14 +10,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;

-import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 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.multitenancy.AsyncConfig;
-import com.iqser.red.service.ocr.v1.server.multitenancy.MultiTenancyMessagingConfiguration;
-import com.iqser.red.service.ocr.v1.server.multitenancy.MultiTenancyWebConfiguration;
 import com.iqser.red.service.ocr.v1.server.settings.OcrServiceSettings;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;

 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -25,7 +21,7 @@ import io.micrometer.core.instrument.MeterRegistry;
@EnableAsync
@EnableConfigurationProperties(OcrServiceSettings.class)
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
-@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MessagingConfiguration.class, MultiTenancyMessagingConfiguration.class, StorageAutoConfiguration.class})
+@Import({DefaultWebMvcConfiguration.class, MessagingConfiguration.class})
@EnableFeignClients(basePackageClasses = FileStatusProcessingUpdateClient.class)
 public class Application {

@@ -46,11 +42,4 @@ public class Application {
        return new TimedAspect(registry);
    }

-
-    @Bean
-    public InvisibleElementRemovalService invisibleElementRemovalService() {
-
-        return new InvisibleElementRemovalService();
-    }
-
 }
@@ -2,7 +2,7 @@ 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.FileStatusProcessingUpdateResource;
+import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;

@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
@@ -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 {
-
-}
@@ -1,13 +1,13 @@
 package com.iqser.red.service.ocr.v1.server.initializer;

 import com.pdftron.pdf.PDFNet;
-
-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 {
@@ -0,0 +1,68 @@
+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();
+    }
+
+}
@@ -0,0 +1,170 @@
+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());
+    }
+
+}
@@ -1,7 +1,6 @@
 package com.iqser.red.service.ocr.v1.server.model;

-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
+import com.iqser.red.service.redaction.v1.model.Rectangle;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -3,12 +3,15 @@ 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;
@@ -16,11 +19,13 @@ public class ImageServiceResponse {

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

 }
@@ -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;
-    }
-
-}
@@ -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.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 jakarta.annotation.PostConstruct;
-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");
-    }
-
-}
@@ -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());
-    }
-}
@@ -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;
-            }
-        };
-    }
-
-}
@@ -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);
-    }
-
-}
@@ -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();
-    }
-
-}
@@ -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);
-            }
-        };
-    }
-
-}
@@ -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();
-    }
-
-}
@@ -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) {
-
-    }
-
-}
@@ -7,8 +7,7 @@ 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.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.storage.commons.service.StorageService;

 import lombok.RequiredArgsConstructor;
@@ -32,39 +31,39 @@ public class FileStorageService {
    @SneakyThrows
    public byte[] getOriginalFile(String dossierId, String fileId) {

-        return IOUtils.toByteArray(storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream());
+        return IOUtils.toByteArray(storageService.getObject(getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream());
    }


    @SneakyThrows
    public InputStream getOriginalFileAsStream(String dossierId, String fileId) {

-        return storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream();
+        return storageService.getObject(getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream();
    }


    public void storeOriginalFile(String dossierId, String fileId, InputStream stream) {

-        storageService.storeObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN), stream);
+        storageService.storeObject(getStorageId(dossierId, fileId, FileType.ORIGIN), stream);
    }


    public boolean untouchedFileExists(String dossierId, String fileId) {

-        return storageService.objectExists(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.UNTOUCHED));
+        return storageService.objectExists(getStorageId(dossierId, fileId, FileType.UNTOUCHED));
    }


    public void storeUntouchedFile(String dossierId, String fileId, byte[] data) {

-        storageService.storeObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.UNTOUCHED), new ByteArrayInputStream(data));
+        storageService.storeObject(getStorageId(dossierId, fileId, FileType.UNTOUCHED), new ByteArrayInputStream(data));
    }


    @SneakyThrows
    public ImageServiceResponse getImageServiceResponse(String dossierId, String fileId) {

-        return storageService.readJSONObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.IMAGE_INFO), ImageServiceResponse.class);
+        return storageService.readJSONObject(getStorageId(dossierId, fileId, FileType.IMAGE_INFO), ImageServiceResponse.class);
    }

 }
@@ -0,0 +1,466 @@
+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 || pathElement.getBBox() == null) {
+            writer.writeElement(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) {
+
+    }
+
+}
@@ -14,7 +14,6 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
 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;
@@ -69,7 +68,14 @@ public class OCRService {

        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();
@@ -5,6 +5,7 @@ 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;
@@ -40,6 +40,10 @@ management:


 storage:
+  signer-type: 'AWSS3V4SignerType'
+  bucket-name: 'redaction'
+  region: 'us-east-1'
+  endpoint: 'https://s3.amazonaws.com'
  backend: 's3'

 pdftron.license: ${PDFTRON_LICENSE}
@@ -9,30 +9,24 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
-import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.junit.jupiter.SpringExtension;

-import com.iqser.red.service.ocr.v1.server.initializer.PDFNetInitializer;
 import com.iqser.red.service.ocr.v1.server.utils.FileSystemBackedStorageService;
 import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 import com.pdftron.pdf.PDFNet;

-import jakarta.annotation.PostConstruct;
 import lombok.SneakyThrows;

@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Import({AbstractTest.TestConfiguration.class, PDFNetInitializer.class})
-@AutoConfigureObservability
+@Import(AbstractTest.TestConfiguration.class)
 public class AbstractTest {

    @Autowired
@@ -41,14 +35,6 @@ public class AbstractTest {
    @MockBean
    protected RabbitTemplate rabbitTemplate;

-    private static String pdftronLicense;
-
-    @PostConstruct
-    @SneakyThrows
-    public void init() {
-        PDFNet.initialize(pdftronLicense);
-    }
-

    @AfterAll
    public static void terminatePDFNet() {
@@ -76,8 +62,7 @@ public class AbstractTest {


    @Configuration
-    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
-    @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)})
+    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
    public static class TestConfiguration {

        @Bean
@@ -1,7 +1,7 @@
 package com.iqser.red.service.ocr.v1.server;

-import static com.iqser.red.pdftronlogic.commons.PdfTextExtraction.extractAllTextFromDocument;
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfTextExtraction.extractAllTextFromDocument;
 import static org.assertj.core.api.Assertions.assertThat;

 import java.io.FileInputStream;
@@ -16,18 +16,15 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.ClassPathResource;

 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.ocr.v1.server.multitenancy.TenantContext;
 import com.iqser.red.service.ocr.v1.server.service.FileStorageService;
 import com.iqser.red.service.ocr.v1.server.service.OCRService;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
 import com.pdftron.pdf.OCRModule;

 import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.micrometer.prometheus.PrometheusTimer;
 import lombok.SneakyThrows;

-
-@Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
@SpringBootTest(properties = {"pdftron.ocrmodule.path=/YourOCRModulePath"})
 public class OcrServiceIntegrationTest extends AbstractTest {

@@ -42,12 +39,13 @@ public class OcrServiceIntegrationTest extends AbstractTest {

    @BeforeEach
    @SneakyThrows
+    @Disabled
    public void assertOCRModuleIsLoaded() {
        assert OCRModule.isModuleAvailable();
    }

-
    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testOCRMetrics() {

        testOCR("Watermark");
@@ -63,6 +61,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {


    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testOcr() {
        // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there
        String text = testOCR("StitchedImagesMultiPage");
@@ -70,6 +69,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {


    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testManyRotatedImages() {
        // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there
        String text = testOCR("manyRotatedImages");
@@ -78,6 +78,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {


    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testMergeImages() {
        // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there
        String text = testOCR("merge_images");
@@ -98,6 +99,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {


    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testOCRWatermark() {

        assertThat(testOCR("Watermark")).contains("syngenta");
@@ -105,6 +107,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {


    @Test
+    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
    public void testOCRInvisibleText() {

        String text = testOCR("InvisibleText");
@@ -119,7 +122,7 @@ public class OcrServiceIntegrationTest extends AbstractTest {
        ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
        var originId = FileStorageService.getStorageId("dossier", "file", FileType.ORIGIN);
        try (var fileStream = pdfFileResource.getInputStream()) {
-            storageService.storeObject(TenantContext.getTenantId(), originId, fileStream);
+            storageService.storeObject(originId, fileStream);
        }
        try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
            ocrService.runOcrOnDocument("dossier", "file", out);
@@ -1,7 +1,7 @@
 package com.iqser.red.service.ocr.v1.server.service;

-import static com.iqser.red.pdftronlogic.commons.PdfTextExtraction.extractAllTextFromDocument;
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfTextExtraction.extractAllTextFromDocument;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

 import java.io.FileInputStream;
@@ -9,18 +9,16 @@ import java.io.FileOutputStream;

 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;

-import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
 import com.iqser.red.service.ocr.v1.server.AbstractTest;

 import lombok.SneakyThrows;

 public class InvisibleElementRemovalServiceTest extends AbstractTest {

-   @Autowired
-   private InvisibleElementRemovalService invisibleElementRemovalService;
+    @Autowired
+    private InvisibleElementRemovalService invisibleElementRemovalService;


    @Test
@@ -46,6 +44,5 @@ public class InvisibleElementRemovalServiceTest extends AbstractTest {
            String[] text = extractAllTextFromDocument(fileStream).split("\n");
            assertThat(text).contains("APPENDIX 16 Pathology Report", "Amendment 1", "Page 255 of 260");
        }
-
    }
 }
@@ -32,7 +32,7 @@ public class FileSystemBackedStorageService implements StorageService {

    @SneakyThrows
    @Override
-    public InputStreamResource getObject(String tenantId, String objectId) {
+    public InputStreamResource getObject(String objectId) {

        var res = dataMap.get(objectId);
        if (res == null) {
@@ -44,22 +44,28 @@ public class FileSystemBackedStorageService implements StorageService {


    @Override
-    public void deleteObject(String tenantId, String objectId) {
+    public void deleteObject(String objectId) {

        dataMap.remove(objectId);
    }


    @Override
-    public boolean objectExists(String tenantId, String objectId) {
+    public boolean objectExists(String objectId) {

        return dataMap.containsKey(objectId);
    }


+    @Override
+    public void init() {
+
+    }
+
+
    @Override
    @SneakyThrows
-    public <T> void storeJSONObject(String tenantId, String objectId, T any) {
+    public <T> void storeJSONObject(String objectId, T any) {

        File tempFile = File.createTempFile("test", ".tmp");
        getMapper().writeValue(new FileOutputStream(tempFile), any);
@@ -75,7 +81,7 @@ public class FileSystemBackedStorageService implements StorageService {

    @Override
    @SneakyThrows
-    public <T> T readJSONObject(String tenantId, String objectId, Class<T> clazz) {
+    public <T> T readJSONObject(String objectId, Class<T> clazz) {

        if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) {
            throw new StorageObjectDoesNotExist("Stored object not found");
@@ -98,7 +104,7 @@ public class FileSystemBackedStorageService implements StorageService {

    @Override
    @SneakyThrows
-    public void storeObject(String tenantId, String objectId, InputStream stream) {
+    public void storeObject(String objectId, InputStream stream) {

        File tempFile = File.createTempFile("test", ".tmp");

@@ -0,0 +1,35 @@
+package com.iqser.red.service.ocr.v1.server.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.pdftron.common.PDFNetException;
+import com.pdftron.pdf.PDFDoc;
+import com.pdftron.pdf.Page;
+import com.pdftron.pdf.PageIterator;
+import com.pdftron.pdf.TextExtractor;
+
+
+public class PdfTextExtraction {
+
+    public static String extractAllTextFromDocument(InputStream fileStream) throws IOException, PDFNetException {
+
+        PDFDoc pdfDoc = new PDFDoc(fileStream);
+        TextExtractor extractor = new TextExtractor();
+        List<String> texts = new ArrayList<>();
+
+        PageIterator iterator = pdfDoc.getPageIterator();
+        while (iterator.hasNext()) {
+            Page page = iterator.next();
+            extractor.begin(page);
+            texts.add(extractor.getAsText());
+        }
+
+        extractor.destroy();
+        pdfDoc.close();
+        return String.join("\n", texts);
+    }
+
+}
@@ -7,13 +7,13 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-dependency</artifactId>
-        <version>2.2.0</version>
+        <version>1.17.0</version>
        <relativePath/>
    </parent>

    <groupId>com.iqser.red.service</groupId>
    <artifactId>ocr-service-v1</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>

    <packaging>pom</packaging>

@@ -27,7 +27,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>2.1.0</version>
+                <version>1.21.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -39,12 +39,12 @@
                <plugin>
                    <groupId>org.sonarsource.scanner.maven</groupId>
                    <artifactId>sonar-maven-plugin</artifactId>
-                    <version>3.9.1.2184</version>
+                    <version>3.9.0.2155</version>
                </plugin>
                <plugin>
                    <groupId>org.owasp</groupId>
                    <artifactId>dependency-check-maven</artifactId>
-                    <version>8.1.2</version>
+                    <version>6.3.1</version>
                    <configuration>
                        <format>ALL</format>
                    </configuration>
@@ -6,12 +6,11 @@

    <groupId>com.iqser.red.service</groupId>
    <artifactId>ocr-service</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>

    <packaging>pom</packaging>

    <modules>
-        <module>bamboo-specs</module>
        <module>ocr-service-v1</module>
        <module>ocr-service-image-v1</module>
    </modules>
Author	SHA1	Message	Date
Dominique Eifländer	f362998189	hotfix: readded fallback if files are stored uncompressed	2023-10-26 14:35:07 +02:00
Ali Oezyetimoglu	be14edfcb1	Merge branch 'RED-7012-361' into 'release/1.14.x' RED-7012: changed writeGStateChanges with writeElement in method processPath... See merge request redactmanager/ocr-service!12	2023-07-18 08:21:36 +02:00
Ali Oezyetimoglu	a68326b864	RED-7012: changed writeGStateChanges with writeElement in method processPath to resolve BASF error when ocring special file	2023-07-18 08:18:23 +02:00
Ali Oezyetimoglu	a27f90e1dd	RED-7012: updated persistence service version for debugging	2023-07-14 09:07:32 +02:00
Dominique Eifländer	25030f534a	Merge branch 'RED-6965-3.6.x' into 'release/1.14.x' RED-6965: Null Pointer in invisible text removal See merge request redactmanager/ocr-service!5	2023-06-30 14:34:13 +02:00
Kevin Tumma	7044d0aa27	Sync to new CI	2023-06-27 11:14:19 +02:00
deiflaender	5917dc5177	RED-6965: Null Pointer in invisible text removal	2023-06-27 11:03:48 +02:00
deiflaender	19f12f0016	RED-5567: Upgraded to lastest pdftron version	2023-05-26 09:20:05 +02:00