RED-5567: Test experimentel pdftron version

Merge in RED/ocr-service from RED-5694-storage to master

* commit '828b4f53c837a77b860dc3df20a8e65b1330eaa8':
  RED-5694 - Upgrade spring-boot to 3.0 - add -DknownExploitedEnabled=false - import StorageAutoConfiguration to Application

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

@@ -5,27 +5,27 @@ 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"
+    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 "newVersion is : $newVersion"
+    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)
+    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
@@ -51,7 +51,7 @@ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
     -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
+    -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 \

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

@@ -12,7 +12,8 @@ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
 echo "dependency-check:aggregate"
 mvn --no-transfer-progress \
     -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-    org.owasp:dependency-check-maven:aggregate
+    org.owasp:dependency-check-maven:aggregate \
+    -DknownExploitedEnabled=false
 
 if [[ -z "${bamboo_repository_pr_key}" ]]
 then

ocr-service-image-v1/pom.xml

@@ -3,16 +3,16 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>com.iqser.red</groupId>
+        <groupId>com.knecon.fforesight</groupId>
         <artifactId>platform-docker-dependency</artifactId>
-        <version>1.2.0</version>
+        <version>0.1.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>
+    <version>3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>

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

@@ -1,4 +1,4 @@
-FROM red/base-image:2.0.0
+FROM red/base-image:2.0.2
 
 COPY "libs/pdftron/OCRModuleLinux.tar.gz" .
 RUN tar xvzf OCRModuleLinux.tar.gz

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

@@ -7,27 +7,17 @@
     <parent>
         <groupId>com.iqser.red.service</groupId>
         <artifactId>ocr-service-v1</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ocr-service-api-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <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>
+        <persistence-service.version>2.1.0</persistence-service.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. -->
@@ -43,26 +33,9 @@
 
         <dependency>
             <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-api-v1</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>redaction-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>persistence-service-internal-api-v1</artifactId>
             <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>

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

@@ -0,0 +1,17 @@
+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-server-v1/pom.xml

@@ -7,11 +7,10 @@
     <parent>
         <groupId>com.iqser.red.service</groupId>
         <artifactId>ocr-service-v1</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>ocr-service-server-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -24,6 +23,12 @@
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>storage-commons</artifactId>
         </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>
@@ -39,17 +44,16 @@
         <dependency>
             <groupId>com.pdftron</groupId>
             <artifactId>PDFNet</artifactId>
-            <version>9.4.0</version>
+            <version>2023-05-24_experimental</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>
+            <version>1.12.440</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -65,7 +69,6 @@
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -81,21 +84,10 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
         </dependency>
     </dependencies>
     <build>
         <plugins>
-            <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>
                 <!-- generate git.properties for exposure in /info -->
                 <groupId>pl.project13.maven</groupId>
@@ -114,6 +106,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessors>
+                        <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
+                    </annotationProcessors>
+                </configuration>
+            </plugin>
             <plugin>
                 <!-- repackages the generated jar into a runnable fat-jar and makes it
                     executable -->

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

@@ -10,10 +10,14 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
+import com.iqser.red.pdftronlogic.commons.InvisibleElementRemovalService;
 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;
@@ -21,7 +25,7 @@ import io.micrometer.core.instrument.MeterRegistry;
 @EnableAsync
 @EnableConfigurationProperties(OcrServiceSettings.class)
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
-@Import({DefaultWebMvcConfiguration.class, MessagingConfiguration.class})
+@Import({MultiTenancyWebConfiguration.class, AsyncConfig.class, MessagingConfiguration.class, MultiTenancyMessagingConfiguration.class, StorageAutoConfiguration.class})
 @EnableFeignClients(basePackageClasses = FileStatusProcessingUpdateClient.class)
 public class Application {
 
@@ -42,4 +46,11 @@ public class Application {
         return new TimedAspect(registry);
     }
 
+
+    @Bean
+    public InvisibleElementRemovalService invisibleElementRemovalService() {
+
+        return new InvisibleElementRemovalService();
+    }
+
 }

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

@@ -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.resources.FileStatusProcessingUpdateResource;
+import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileStatusProcessingUpdateResource;
 
 @FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {

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

@@ -0,0 +1,10 @@
+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/initializer/PDFNetInitializer.java

@@ -1,14 +1,12 @@
 package com.iqser.red.service.ocr.v1.server.initializer;
 
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
 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;
 
 @Component
 @RequiredArgsConstructor
@@ -29,7 +27,5 @@ public class PDFNetInitializer {
         PDFNet.setTempPath("/tmp/pdftron");
         PDFNet.addResourceSearchPath(ocrModulePath);
         PDFNet.initialize(pdftronLicense);
-
     }
-
 }

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

@@ -1,54 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model;
-
-import com.pdftron.pdf.Rect;
-import lombok.Data;
-import lombok.SneakyThrows;
-
-import java.awt.geom.Area;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
-import java.util.ArrayDeque;
-import java.util.Deque;
-
-@Data
-public class ClippingPathStack {
-
-    private Deque<Area> stack = new ArrayDeque<>();
-
-    @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) {
-        // Height or width are zero for straight lines, even though they are being rendered. Therefore, height or width must be at minimum >0.
-        double tolerance = 1e-3;
-        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,149 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.model;
-
-import com.pdftron.common.PDFNetException;
-import com.pdftron.pdf.Element;
-import com.pdftron.pdf.Rect;
-import lombok.*;
-import lombok.experimental.SuperBuilder;
-
-import java.awt.geom.Rectangle2D;
-
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-public abstract class ElementFeatures {
-    private int elementType;
-    private Rectangle2D boundingBox;
-
-    public boolean almostMatches(Element element) throws PDFNetException {
-        if (element.getType() != elementType) return false;
-        if (element.getBBox() == null) return false;
-        return rectsAlmostMatch(element.getBBox());
-    }
-
-    protected boolean almostEqual(double a, double b) {
-        double tolerance = 1e-3;
-        return Math.abs(a - b) < tolerance;
-    }
-
-    @SneakyThrows
-    private boolean rectsAlmostMatch(Rect bBox) {
-        if (!almostEqual(bBox.getX1(), boundingBox.getX())) return false;
-        if (!almostEqual(bBox.getY1(), boundingBox.getY())) return false;
-        if (!almostEqual(bBox.getWidth(), boundingBox.getWidth())) return false;
-        return almostEqual(bBox.getHeight(), boundingBox.getHeight());
-    }
-
-    @EqualsAndHashCode(callSuper = true)
-    @Data
-    @SuperBuilder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Text extends ElementFeatures {
-        private String text;
-        private int font;
-        private double fontsize;
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-            if (!super.almostMatches(element)) return false;
-            if (!text.equals(element.getTextString())) return false;
-            if (font != element.getGState().getFont().getType()) return false;
-            return almostEqual(fontsize, element.getGState().getFontSize());
-        }
-
-    }
-
-    @EqualsAndHashCode(callSuper = true)
-    @Data
-    @SuperBuilder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Path extends ElementFeatures {
-        private boolean isClippingPath;
-        private boolean isClipWindingFill;
-        private boolean isStroked;
-        private boolean isFilled;
-        private boolean isWindingFill;
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-            if (!super.almostMatches(element)) return false;
-            if (isClippingPath != element.isClippingPath()) return false;
-            if (isClipWindingFill != element.isClipWindingFill()) return false;
-            if (isStroked != element.isStroked()) return false;
-            if (isFilled != element.isFilled()) return false;
-            if (isWindingFill != element.isWindingFill()) return false;
-
-            return true;
-        }
-    }
-
-    @EqualsAndHashCode(callSuper = true)
-    @Data
-    @SuperBuilder
-    @NoArgsConstructor
-    public static class Image extends ElementFeatures {
-        private int dataSize;
-        private int height;
-        private int width;
-        private int renderingIntent;
-        private int componentNum;
-        private int bitsPerComponent;
-
-        @Override
-        public boolean almostMatches(Element element) throws PDFNetException {
-            if (!super.almostMatches(element)) return false;
-            if (dataSize != element.getImageDataSize()) return false;
-            if (height != element.getImageHeight()) return false;
-            if (width != element.getImageWidth()) return false;
-            if (renderingIntent != element.getImageRenderingIntent()) return false;
-            if (componentNum != element.getComponentNum()) return false;
-            if (bitsPerComponent != element.getBitsPerComponent()) return false;
-            return true;
-        }
-    }
-
-    public static ElementFeatures extractFeatures(Element element) throws PDFNetException {
-        switch (element.getType()) {
-            case Element.e_path:
-                return ElementFeatures.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:
-                return ElementFeatures.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:
-            case Element.e_inline_image:
-                return 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();
-            default:
-                throw new UnsupportedOperationException("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,6 +1,7 @@
 package com.iqser.red.service.ocr.v1.server.model;
 
-import com.iqser.red.service.redaction.v1.model.Rectangle;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.redactionlog.Rectangle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -3,15 +3,12 @@ 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;
@@ -19,13 +16,11 @@ 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;}
 
 }

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

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

@@ -0,0 +1,105 @@
+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");
+    }
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,35 @@
+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/FileStorageService.java

@@ -7,7 +7,8 @@ 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.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+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 lombok.RequiredArgsConstructor;
@@ -31,39 +32,39 @@ public class FileStorageService {
     @SneakyThrows
     public byte[] getOriginalFile(String dossierId, String fileId) {
 
-        return IOUtils.toByteArray(storageService.getObject(getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream());
+        return IOUtils.toByteArray(storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream());
     }
 
 
     @SneakyThrows
     public InputStream getOriginalFileAsStream(String dossierId, String fileId) {
 
-        return storageService.getObject(getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream();
+        return storageService.getObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN)).getInputStream();
     }
 
 
     public void storeOriginalFile(String dossierId, String fileId, InputStream stream) {
 
-        storageService.storeObject(getStorageId(dossierId, fileId, FileType.ORIGIN), stream);
+        storageService.storeObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.ORIGIN), stream);
     }
 
 
     public boolean untouchedFileExists(String dossierId, String fileId) {
 
-        return storageService.objectExists(getStorageId(dossierId, fileId, FileType.UNTOUCHED));
+        return storageService.objectExists(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.UNTOUCHED));
     }
 
 
     public void storeUntouchedFile(String dossierId, String fileId, byte[] data) {
 
-        storageService.storeObject(getStorageId(dossierId, fileId, FileType.UNTOUCHED), new ByteArrayInputStream(data));
+        storageService.storeObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.UNTOUCHED), new ByteArrayInputStream(data));
     }
 
 
     @SneakyThrows
     public ImageServiceResponse getImageServiceResponse(String dossierId, String fileId) {
 
-        return storageService.readJSONObject(getStorageId(dossierId, fileId, FileType.IMAGE_INFO), ImageServiceResponse.class);
+        return storageService.readJSONObject(TenantContext.getTenantId(), getStorageId(dossierId, fileId, FileType.IMAGE_INFO), ImageServiceResponse.class);
     }
 
 }

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

@@ -0,0 +1,196 @@
+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/InvisibleElementService.java

@@ -1,463 +0,0 @@
-package com.iqser.red.service.ocr.v1.server.service;
-
-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.*;
-import com.pdftron.sdf.Obj;
-import com.pdftron.sdf.SDFDoc;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
-import org.springframework.stereotype.Service;
-
-import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class InvisibleElementService {
-
-    /*
-    handled cases:
-        Text or Path outside of clipping path
-        Text which is transparent or is set to not render
-        Text or Path that have been painted over by visible and filled Paths
-    unhandled cases:
-        Text covered by widely stroked path
-        Text same color as background
-        Any Text set to clipping with its many interactions with other elements
-     */
-    @SneakyThrows
-    public byte[] removeInvisibleTextOrPathElements(byte[] pdfFile, boolean delta) {
-        PDFDoc pdfDoc = new PDFDoc(pdfFile);
-
-        ElementWriter writer = new ElementWriter();
-        ElementReader reader = new ElementReader();
-        Set<Integer> visited = new TreeSet<>();
-
-        for (PageIterator iterator = pdfDoc.getPageIterator(); iterator.hasNext(); ) {
-            Page page = iterator.next();
-            List<ElementFeatures> overlappedElements = removeClippedElementsAndInvisibleTextAndRememberOverlappedElements(page, reader, writer, visited, delta);
-            visited.clear();
-            removeOverlappedElements(page, reader, writer, visited, overlappedElements, delta);
-        }
-
-        if (delta) {
-            debugSave(pdfDoc.save(SDFDoc.SaveMode.LINEARIZED, null));
-        }
-
-        return pdfDoc.save(SDFDoc.SaveMode.LINEARIZED, null);
-    }
-
-    private List<ElementFeatures> removeClippedElementsAndInvisibleTextAndRememberOverlappedElements(Page page, ElementReader reader, ElementWriter writer, Set<Integer> visited, boolean delta)
-            throws PDFNetException {
-        var overlappedElements = new ArrayList<ElementFeatures>();
-        var visibleElements = new ArrayList<ElementFeatures>();
-        ClippingPathStack clippingPathStack = new ClippingPathStack(page.getMediaBox());
-        visited.add((int) page.getSDFObj().getObjNum());
-        reader.begin(page);
-        writer.begin(page, ElementWriter.e_replacement, false, true, page.getResourceDict());
-        processElements(reader, writer, visited, clippingPathStack, delta, overlappedElements, visibleElements);
-        writer.end();
-        reader.end();
-        return overlappedElements;
-    }
-
-    private void processElements(ElementReader reader, ElementWriter writer, Set<Integer> visited, ClippingPathStack clippingPathStack, Boolean delta,
-                                 List<ElementFeatures> coveredElements, List<ElementFeatures> visibleElements)
-            throws PDFNetException {
-
-        for (Element element = reader.next(); element != null; element = reader.next())
-            switch (element.getType()) {
-
-                case Element.e_image:
-                case Element.e_inline_image:
-                    processImages(element, writer, clippingPathStack, delta, visibleElements);
-                    break;
-
-                case Element.e_text:
-                    processText(element, writer, clippingPathStack, delta, visibleElements);
-                    break;
-
-                case Element.e_path:
-                    processPath(element, writer, clippingPathStack, delta, coveredElements, visibleElements);
-                    break;
-
-                case Element.e_form:
-                    processForm(reader, writer, element, visited, clippingPathStack, delta, coveredElements, visibleElements);
-                    break;
-
-                case Element.e_group_begin:
-                    clippingPathStack.enterNewGState();
-                    writer.writeElement(element);
-                    break;
-
-                case Element.e_group_end:
-                    clippingPathStack.leaveGState();
-                    writer.writeElement(element);
-                    break;
-
-                default:
-                    writer.writeElement(element);
-            }
-    }
-
-    private void processImages(Element imageElement, ElementWriter writer, ClippingPathStack clippingPathStack, Boolean delta, List<ElementFeatures> visibleElements)
-            throws PDFNetException {
-
-        Rect rect = imageElement.getBBox();
-
-        if (rect == null) {
-            return;
-        }
-
-        boolean inClippingPath = clippingPathStack.almostIntersects(rect.getX1(), rect.getY1(), rect.getWidth(), rect.getHeight());
-
-        if (!delta && inClippingPath) {
-            visibleElements.add(ElementFeatures.extractFeatures(imageElement));
-            writer.writeElement(imageElement);
-        }
-
-        if (delta && !inClippingPath) {
-            writer.writeElement(imageElement);
-        }
-    }
-
-    private void processText(Element textElement, ElementWriter writer, ClippingPathStack clippingPathStack,
-                             Boolean delta, List<ElementFeatures> visibleElements)
-            throws PDFNetException {
-
-        Rect rect = textElement.getBBox();
-
-        if (rect == null) {
-            writer.writeElement(textElement);
-            return;
-        }
-
-        GState gState = textElement.getGState();
-
-        boolean inClippingPath = clippingPathStack.almostIntersects(rect.getX1(), rect.getY1(), rect.getWidth(), rect.getHeight());
-
-        boolean isTextVisible = isTextRenderedVisibly(gState);
-
-        if (inClippingPath && isTextVisible) {
-            visibleElements.add(ElementFeatures.extractFeatures(textElement));
-        }
-        if (!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());
-                gState.setFillColor(new ColorPt(1, 0, 0));
-                writer.writeElement(textElement);
-            }
-            if (!isTextVisible) {
-                gState.setFillColorSpace(ColorSpace.createDeviceRGB());
-                gState.setFillColor(new ColorPt(0, 0, 1));
-                gState.setTextRenderMode(GState.e_fill_text);
-                gState.setFillOpacity(1);
-                writer.writeElement(textElement);
-            }
-        }
-    }
-
-    private void processForm(ElementReader reader, ElementWriter writer, Element element, Set<Integer> visited, ClippingPathStack clippingPathStack, Boolean delta,
-                             List<ElementFeatures> coveredElements, List<ElementFeatures> allElements)
-            throws PDFNetException {
-
-        writer.writeElement(element);
-        Obj formObj = element.getXObject();
-
-        if (!visited.contains((int) formObj.getObjNum())) {
-            visited.add((int) formObj.getObjNum());
-            ElementWriter new_writer = new ElementWriter();
-            reader.formBegin();
-            new_writer.begin(formObj);
-
-            reader.clearChangeList();
-            new_writer.setDefaultGState(reader);
-
-            processElements(reader, new_writer, visited, clippingPathStack, delta, coveredElements, allElements);
-            new_writer.end();
-            reader.end();
-        }
-    }
-
-    private void processPath(Element pathElement, ElementWriter writer, ClippingPathStack clippingPathStack, Boolean delta,
-                             List<ElementFeatures> overlappedElements, List<ElementFeatures> visibleElements)
-            throws PDFNetException {
-
-        GeneralPath linePath = convertToGeneralPath(pathElement.getPathData());
-
-        //transform path to initial user space
-        var ctm = pathElement.getCTM();
-        var affineTransform = getAffineTransform(ctm);
-        linePath.transform(affineTransform);
-
-        var rect = linePath.getBounds2D();
-
-        boolean inClippingPath = 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);
-            }
-
-            clippingPathStack.intersectClippingPath(linePath);
-            pathElement.setPathClip(!delta);
-            writer.writeElement(pathElement);
-
-        } else {
-            if (inClippingPath) {
-                if (isFilledAndNonTransparent(pathElement)) {
-                    List<ElementFeatures> currentOverlappedElements = visibleElements.stream()
-                            .filter(features -> almostContains(linePath, features.getBoundingBox()))
-                            .collect(Collectors.toList());
-                    overlappedElements.addAll(currentOverlappedElements);
-                    visibleElements.removeAll(currentOverlappedElements);
-                }
-                visibleElements.add(ElementFeatures.extractFeatures(pathElement));
-                if (!delta) {
-                    writer.writeElement(pathElement);
-                }
-            }
-            if (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 static AffineTransform getAffineTransform(Matrix2D ctm) throws PDFNetException {
-        return new AffineTransform(ctm.getA(), ctm.getB(), ctm.getC(), ctm.getD(), ctm.getH(), ctm.getV());
-    }
-
-    private void removeOverlappedElements(Page page, ElementReader reader, ElementWriter writer, Set<Integer> visited, List<ElementFeatures> overlappedElements, boolean delta)
-            throws PDFNetException {
-        reader.begin(page);
-        writer.begin(page, ElementWriter.e_replacement, false, true, page.getResourceDict());
-        if (delta) {
-            overlappedElements.forEach(feature -> drawBBox(writer, feature.getBoundingBox(), "#00FF00"));
-            overlappedElements.clear();
-        }
-        processOverlappedElements(reader, writer, visited, overlappedElements, delta);
-        writer.end();
-        reader.end();
-
-        if (overlappedElements.size() > 0) {
-            log.warn(overlappedElements.size() + " overlapped elements have not been found and removed");
-        }
-    }
-
-    private void processOverlappedElements(ElementReader reader, ElementWriter writer, Set<Integer> visited, List<ElementFeatures> coveredElements, boolean delta)
-            throws PDFNetException {
-        for (Element element = reader.next(); element != null; element = reader.next()) {
-            switch (element.getType()) {
-                case Element.e_form:
-                    processFormOverlappedElements(reader, writer, element, visited, coveredElements, delta);
-                    break;
-                case Element.e_path:
-                case Element.e_image:
-                case Element.e_inline_image:
-                case Element.e_text:
-                    boolean anyMatch = false;
-                    for (ElementFeatures elementToRemove : coveredElements) {
-                        if (elementToRemove.almostMatches(element)) {
-                            coveredElements.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);
-                    }
-                    break;
-
-                default:
-                    writer.writeElement(element);
-
-            }
-        }
-    }
-
-    private void processFormOverlappedElements(ElementReader reader, ElementWriter writer, Element element, Set<Integer> visited, List<ElementFeatures> elementsToRemove, boolean delta)
-            throws PDFNetException {
-
-        writer.writeElement(element);
-        Obj formObj = element.getXObject();
-
-        if (!visited.contains((int) formObj.getObjNum())) {
-            visited.add((int) formObj.getObjNum());
-            ElementWriter new_writer = new ElementWriter();
-            reader.formBegin();
-            new_writer.begin(formObj);
-
-            reader.clearChangeList();
-            new_writer.setDefaultGState(reader);
-
-            processOverlappedElements(reader, new_writer, visited, elementsToRemove, delta);
-            new_writer.end();
-            reader.end();
-        }
-    }
-
-    private boolean isTextRenderedVisibly(GState gState) throws PDFNetException {
-        if (gState.getTextRenderMode() == GState.e_invisible_text) return false;
-        if (gState.getTextRenderMode() == GState.e_fill_text && gState.getFillOpacity() == 0) return false;
-        if (gState.getTextRenderMode() == GState.e_stroke_text && gState.getStrokeOpacity() == 0) return false;
-        if (gState.getTextRenderMode() == GState.e_fill_stroke_text && gState.getFillOpacity() == 0 && gState.getStrokeOpacity() == 0) return false;
-        return true;
-    }
-
-    private GeneralPath convertToGeneralPath(PathData pathData) throws PDFNetException {
-        GeneralPath linePath = new GeneralPath();
-
-        double[] dataPoints = pathData.getPoints();
-        byte[] opr = pathData.getOperators();
-
-        double x1;
-        double y1;
-        double x2;
-        double y2;
-        double x3;
-        double y3;
-
-        int data_index = 0;
-        for (int opr_index = 0; opr_index < opr.length; ++opr_index) {
-            switch (opr[opr_index]) {
-                case PathData.e_moveto:
-                    x1 = dataPoints[data_index];
-                    ++data_index;
-                    y1 = dataPoints[data_index];
-                    ++data_index;
-
-                    linePath.moveTo(x1, y1);
-                    break;
-                case PathData.e_lineto:
-                    x1 = dataPoints[data_index];
-                    ++data_index;
-                    y1 = dataPoints[data_index];
-                    ++data_index;
-
-                    linePath.lineTo(x1, y1);
-                    break;
-                case PathData.e_cubicto:
-                    x1 = dataPoints[data_index];
-                    ++data_index;
-                    y1 = dataPoints[data_index];
-                    ++data_index;
-                    x2 = dataPoints[data_index];
-                    ++data_index;
-                    y2 = dataPoints[data_index];
-                    ++data_index;
-                    x3 = dataPoints[data_index];
-                    ++data_index;
-                    y3 = dataPoints[data_index];
-                    ++data_index;
-
-                    linePath.curveTo(x1, y1, x2, y2, x3, y3);
-                    break;
-                case PathData.e_rect:
-                    x1 = dataPoints[data_index];
-                    ++data_index;
-                    y1 = dataPoints[data_index];
-                    ++data_index;
-                    double w = dataPoints[data_index];
-                    ++data_index;
-                    double h = dataPoints[data_index];
-                    ++data_index;
-                    x2 = x1 + w;
-                    y2 = y1;
-                    x3 = x2;
-                    y3 = y1 + h;
-                    double x4 = x1;
-                    double y4 = y3;
-
-                    linePath.moveTo(x1, y1);
-                    linePath.lineTo(x2, y2);
-                    linePath.lineTo(x3, y3);
-                    linePath.lineTo(x4, y4);
-                    break;
-                case PathData.e_closepath:
-                    linePath.closePath();
-                    break;
-                default:
-                    throw new PDFNetException("Invalid Element Type", 0, "", "", "");
-            }
-        }
-        return linePath;
-    }
-
-    private boolean almostContains(Shape outer, Rectangle2D inner) {
-        double tolerance = 1e-3;
-
-        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;
-    }
-
-
-    private void debugSave(byte[] pdfFile) {
-        String fileLocation = "/tmp/delta.pdf";
-        try (var f_out = FileUtils.openOutputStream(new File(fileLocation))) {
-            f_out.write(pdfFile);
-        } catch (IOException e) {
-            throw new RuntimeException("File location: " + fileLocation + "could not be openend, no file will be saved");
-        }
-    }
-
-    @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);
-    }
-}

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

@@ -1,29 +1,36 @@
 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.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.model.ImagePosition;
-import com.iqser.red.service.ocr.v1.server.model.image.ImageServiceResponse;
 import com.iqser.red.service.ocr.v1.server.settings.OcrServiceSettings;
-import com.iqser.red.service.persistence.service.v1.api.utils.SuppressFBWarnings;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.pdftron.pdf.*;
+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;
-import org.apache.commons.io.IOUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.stereotype.Service;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.*;
-
 
 @Slf4j
 @Service
@@ -39,139 +46,146 @@ public class OCRService {
 
     private final ObjectMapper objectMapper;
 
-    private final InvisibleElementService invisibleElementService;
+    private final InvisibleElementRemovalService invisibleElementRemovalService;
 
-    @Timed("redactmanager_PDFTron-ocrDocument")
-    @SneakyThrows
-    public InputStream ocrDocument(String dossierId, String fileId) {
-
-        var fileStream = fileStorageService.getOriginalFileAsStream(dossierId, fileId);
-
-        var imageServiceResponse = fileStorageService.getImageServiceResponse(dossierId, fileId);
-
-        var fileBytes = IOUtils.toByteArray(fileStream);
-
-        var ocrBytes = ocr(fileBytes, fileId, imageServiceResponse);
-
-        return new ByteArrayInputStream(ocrBytes);
-
-    }
+    private final ImagePositionRetrievalService imagePositionRetrievalService;
 
 
-    @SuppressFBWarnings("REC_CATCH_EXCEPTION")
-    private byte[] ocr(byte[] file, String fileId, ImageServiceResponse imageServiceResponse) {
+    /**
+     * 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 {
 
-        PDFDoc pdfDoc = null;
-
-        var fileWithoutInvisibleText = invisibleElementService.removeInvisibleTextOrPathElements(file, false);
-
-        try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
-            pdfDoc = new PDFDoc(fileWithoutInvisibleText);
-
-            Map<Integer, List<ImagePosition>> pages = new HashMap<>();
-
-            // TODO take logic to ignore small and combine images from image-service.
-            // TODO Then replace logic so ocr-service is independent from image-service.
-            imageServiceResponse.getData()
-                    .forEach(imageMetadata -> pages.computeIfAbsent(imageMetadata.getPosition().getPageNumber(), x -> new ArrayList<>())
-                            .add(new ImagePosition(new Rectangle(new Point(imageMetadata.getPosition().getX1(), imageMetadata.getPosition().getY1()),
-                                    imageMetadata.getGeometry().getWidth(),
-                                    imageMetadata.getGeometry().getHeight(),
-                                    imageMetadata.getPosition().getPageNumber()), imageMetadata.isAlpha())));
-
-            Map<Integer, PDFDoc> pdfDocMap = Collections.synchronizedMap(new HashMap<>());
-
-            rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                    objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder().fileId(fileId).numberOfPagesToOCR(pages.keySet().size()).build()));
-
-            ocrPages(pdfDoc, fileId, pages, pdfDocMap);
-
-            for (var entry : pdfDocMap.entrySet()) {
-
-                var ocrDoc = entry.getValue();
-                var page = entry.getKey();
-
-                Page ocrPage = ocrDoc.getPageIterator(1).next();
-                pdfDoc.pageInsert(pdfDoc.getPageIterator(page), ocrPage);
-                pdfDoc.pageRemove(pdfDoc.getPageIterator(page + 1));
-
-                ocrDoc.close();
+        try (ByteArrayOutputStream transferOutputStream = new ByteArrayOutputStream()) {
+            try (InputStream fileStream = fileStorageService.getOriginalFileAsStream(dossierId, fileId)) {
+                invisibleElementRemovalService.removeInvisibleElements(fileStream, transferOutputStream, false);
             }
-            Optimizer.optimize(pdfDoc);
-            pdfDoc.save(out, SDFDoc.SaveMode.LINEARIZED, null);
-            pdfDoc.close();
-
-            rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                    objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder()
-                            .fileId(fileId)
-                            .numberOfPagesToOCR(pages.keySet().size())
-                            .numberOfOCRedPages(pages.keySet().size())
-                            .ocrFinished(true)
-                            .build()));
-
-            return out.toByteArray();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            if (pdfDoc != null) {
-                try {
-                    pdfDoc.close();
-                } catch (Exception e) {
-                    log.debug("Failed to close document", e);
-                }
+            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 ocrPages(PDFDoc pdfDoc, String fileId, Map<Integer, List<ImagePosition>> pages, Map<Integer, PDFDoc> pdfDocMap) {
+    private void runOcr(InputStream fileStream, OutputStream out, String fileId) {
 
-        int numberOfOCRedPages = 0;
-        for (var pageEntry : pages.entrySet()) {
+        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 {
-                RectCollection rectCollection = new RectCollection();
+                PDFDoc singlePagePdfDoc = extractSinglePagePdfDoc(pdfDoc, pageId);
+                processOcr(pageIdToRectCollection, pageId, singlePagePdfDoc);
 
-                var page = pageEntry.getKey();
+                log.info("{}/{} Page {} done, OCR regions {}",
+                        numProcessedPages,
+                        pageIdToRectCollection.size(),
+                        pageId,
+                        getAllOcrTextZonesAsString(pageIdToRectCollection, pageId));
 
-                Page pdfPage = pdfDoc.getPageIterator(page).next();
+                pageIdToSinglePagePdfDoc.put(pageId, singlePagePdfDoc);
+                ++numProcessedPages;
 
-                pdfPage.setMediaBox(pdfPage.getCropBox());
+                rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
+                        objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder()
+                                .fileId(fileId)
+                                .numberOfPagesToOCR(pageIdToRectCollection.size())
+                                .numberOfOCRedPages(numProcessedPages)
+                                .build()));
 
-                for (ImagePosition imagePosition : pageEntry.getValue()) {
-                    Rectangle rectangle = imagePosition.getRectangle();
-
-                    // Warning coordinate system is different in this call macOs/Linux
-                    double y = -rectangle.getTopLeft().getY() + pdfPage.getCropBox().getY2() - rectangle.getHeight();
-                    rectCollection.addRect(rectangle.getTopLeft().getX(), y, rectangle.getTopLeft().getX() + rectangle.getWidth(), y + rectangle.getHeight());
-                }
-
-                PDFDoc ocrDoc = new PDFDoc();
-                ocrDoc.pagePushBack(pdfPage);
-                pdfDocMap.put(pageEntry.getKey(), ocrDoc);
-
-                OCROptions options = new OCROptions();
-                options.addTextZonesForPage(rectCollection, 1);
-                options.addLang(ENGLISH);
-                options.addDPI(settings.getOcrDPI());
-                OCRModule.processPDF(ocrDoc, options);
-
-                rectCollection.clear();
-
-            } catch (Exception e) {
-                log.warn("Failed to process PDF page {} - {}", pageEntry.getKey(), e);
+            } catch (PDFNetException e) {
+                log.error("Failed to process page {}", pageId);
+                throw new RuntimeException(e);
             }
-
-            rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE,
-                    objectMapper.writeValueAsString(OCRStatusUpdateResponse.builder()
-                            .fileId(fileId)
-                            .numberOfPagesToOCR(pages.keySet().size())
-                            .numberOfOCRedPages(++numberOfOCRedPages)
-                            .build()));
-
-            log.warn("Done page {}", pageEntry);
-
         }
+        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,20 +1,22 @@
 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 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 com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-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.api.model.DocumentRequest;
-
-import feign.FeignException;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 @Slf4j
 @Service
@@ -34,7 +36,6 @@ public class OcrMessageReceiver {
 
         DocumentRequest ocrRequestMessage = objectMapper.readValue(in, DocumentRequest.class);
 
-        long start = System.currentTimeMillis();
         log.info("Start ocr for file with dossierId {} and fileId {}", ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
 
         setStatusOcrProcessing(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
@@ -44,12 +45,15 @@ public class OcrMessageReceiver {
             fileStorageService.storeUntouchedFile(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), originalFile);
         }
 
-        var ocrResult = ocrService.ocrDocument(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId());
-
-        fileStorageService.storeOriginalFile(ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), ocrResult);
-
-        long end = System.currentTimeMillis();
-        log.info("Successfully processed ocr for file with dossierId {} and fileId {}, took {}", ocrRequestMessage.getDossierId(), ocrRequestMessage.getFileId(), end - start);
+        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());
     }

ocr-service-v1/ocr-service-server-v1/src/main/resources/application.yml

@@ -35,15 +35,11 @@ management:
     metrics.enabled: ${monitoring.enabled:false}
     prometheus.enabled: ${monitoring.enabled:false}
     health.enabled: true
-  endpoints.web.exposure.include: prometheus, health
+  endpoints.web.exposure.include: prometheus, health, metrics
   metrics.export.prometheus.enabled: ${monitoring.enabled:false}
 
 
 storage:
-  signer-type: 'AWSS3V4SignerType'
-  bucket-name: 'redaction'
-  region: 'us-east-1'
-  endpoint: 'https://s3.amazonaws.com'
   backend: 's3'
 
-pdftron.license: ${PDFTRON_LICENSE}
+pdftron.license: ${PDFTRON_LICENSE}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java

@@ -0,0 +1,91 @@
+package com.iqser.red.service.ocr.v1.server;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+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
+public class AbstractTest {
+
+    @Autowired
+    protected StorageService storageService;
+
+    @MockBean
+    protected RabbitTemplate rabbitTemplate;
+
+    private static String pdftronLicense;
+
+    @PostConstruct
+    @SneakyThrows
+    public void init() {
+        PDFNet.initialize(pdftronLicense);
+    }
+
+
+    @AfterAll
+    public static void terminatePDFNet() {
+        PDFNet.terminate();
+        System.out.println("PDFNet Terminated");
+    }
+
+
+    @SneakyThrows
+    public void dummyTest() {
+
+        // Build needs one test to not fail.
+        assertThat(1).isEqualTo(1);
+    }
+
+
+    @AfterEach
+    public void cleanupStorage() {
+
+        if (this.storageService instanceof FileSystemBackedStorageService) {
+            ((FileSystemBackedStorageService) this.storageService).clearStorage();
+        }
+    }
+
+
+
+    @Configuration
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)})
+    public static class TestConfiguration {
+
+        @Bean
+        @Primary
+        public StorageService inMemoryStorage() {
+
+            return new FileSystemBackedStorageService();
+        }
+
+    }
+}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/InvisibleElementServiceTest.java

@@ -1,64 +0,0 @@
-package com.iqser.red.service.ocr.v1.server;
-
-import com.iqser.red.service.ocr.v1.server.service.InvisibleElementService;
-import lombok.SneakyThrows;
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-
-import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
-
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT //
-        , properties = {"pdftron.ocrmodule.path=/YourOCRModulePath"})
-@Import(OcrServiceIntegrationTest.TestConfiguration.class)
-public class InvisibleElementServiceTest {
-
-    @Autowired
-    private InvisibleElementService invisibleElementService;
-
-    @MockBean
-    protected RabbitTemplate rabbitTemplate;
-
-    @Test
-    @SneakyThrows
-    public void testRemoveInvisibleText() {
-        String fileName = "InvisibleText";
-
-        ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
-
-        var initialFileBytes = Files.readAllBytes(pdfFileResource.getFile().toPath());
-
-        var fileWithoutInvisibleText = invisibleElementService.removeInvisibleTextOrPathElements(initialFileBytes, false);
-        var deltaFile = invisibleElementService.removeInvisibleTextOrPathElements(initialFileBytes, true);
-
-        String fileWithoutInvisibleTextLocation = getTemporaryDirectory() + "/" + fileName + ".pdf";
-        String deltaFileLocation = getTemporaryDirectory() + "/" + fileName + "_delta.pdf";
-
-        saveToFile(fileWithoutInvisibleTextLocation, fileWithoutInvisibleText);
-        saveToFile(deltaFileLocation, deltaFile);
-
-        System.out.println("File:" + fileWithoutInvisibleTextLocation);
-        System.out.println("File:" + deltaFileLocation);
-    }
-
-    private void saveToFile(String location, byte[] fileBytes) {
-        try (var f_out = FileUtils.openOutputStream(new File(location))) {
-            f_out.write(fileBytes);
-        } catch (IOException e) {
-            throw new RuntimeException("File location: " + location + "could not be openend, no file will be saved");
-        }
-
-    }
-}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java

@@ -1,138 +1,133 @@
 package com.iqser.red.service.ocr.v1.server;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-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.ocr.v1.server.utils.FileSystemBackedStorageService;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.storage.commons.StorageAutoConfiguration;
-import com.iqser.red.storage.commons.service.StorageService;
-import lombok.SneakyThrows;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-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.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import java.io.File;
-
+import static com.iqser.red.pdftronlogic.commons.PdfTextExtraction.extractAllTextFromDocument;
 import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT //
-        , properties = {"pdftron.ocrmodule.path=/YourOCRModulePath"})
-@Import(OcrServiceIntegrationTest.TestConfiguration.class)
-public class OcrServiceIntegrationTest {
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.concurrent.TimeUnit;
 
-    @Autowired
-    protected StorageService storageService;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.io.ClassPathResource;
 
-    @Autowired
-    protected FileStorageService fileStorageService;
+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.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 {
 
     @Autowired
     protected ObjectMapper objectMapper;
 
-    @MockBean
-    protected RabbitTemplate rabbitTemplate;
-
     @Autowired
     private OCRService ocrService;
 
+    @Autowired
+    private PrometheusMeterRegistry registry;
 
-    @Test
-    @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top.
+    @BeforeEach
     @SneakyThrows
-    public void testOCR() {
-
-        String fileName = "Watermark";
-
-        ClassPathResource imageInfoResource = new ClassPathResource("files/" + fileName + ".IMAGE_INFO.json");
-        ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
-
-        var originId = FileStorageService.getStorageId("dossier", "file", FileType.ORIGIN);
-        storageService.storeObject(originId, pdfFileResource.getInputStream());
-
-        var imageId = FileStorageService.getStorageId("dossier", "file", FileType.IMAGE_INFO);
-        storageService.storeObject(imageId, imageInfoResource.getInputStream());
-
-        var response = ocrService.ocrDocument("dossier", "file");
-
-        var out = FileUtils.openOutputStream(new File(getTemporaryDirectory() + "/" + fileName + ".pdf"));
-        IOUtils.copy(response, out);
-
-        System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
+    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");
+        testOCR("Watermark");
+        testOCR("Watermark");
+
+        var ocrOnDocumentMeter = registry.getMeters().stream().filter(m -> m.getId().getName().equalsIgnoreCase("redactmanager_runOcrOnDocument")).findAny();
+        assertThat(ocrOnDocumentMeter.isPresent()).isTrue();
+        PrometheusTimer timer = (PrometheusTimer) ocrOnDocumentMeter.get();
+        assertThat(timer.count()).isEqualTo(3);
+        assertThat(timer.mean(TimeUnit.SECONDS)).isGreaterThan(0.1);
+    }
+
+
+    @Test
+    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");
+    }
+
+
+    @Test
+    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");
+        assertThat(text).contains("Michela", "Gregori", "DVM", "PhD", "Pathologist");
+    }
+
+
+    @Test
+    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");
+        assertThat(text).contains("Bodyweight change of dams with live young - group mean values",
+                "Control",
+                "mg/g day",
+                "10 mg/kg/day",
+                "20 mg/kg/",
+                "Days",
+                "50",
+                "-200",
+                "—250",
+                "150",
+                "200",
+                "250",
+                "—150");
+    }
+
+
+    @Test
+    public void testOCRWatermark() {
+
+        assertThat(testOCR("Watermark")).contains("syngenta");
+    }
+
+
+    @Test
+    public void testOCRInvisibleText() {
+
+        String text = testOCR("InvisibleText");
+        assertThat(text).contains("Michela", "Gregori", "DVM", "PhD", "Pathologist", "SIGNATURE PAGE");
+        assertThat(text).doesNotContain("COMPLETION DATE:", "LABORATORY PROJECT ID:", "AUTHOR(S):", "Substance");
+    }
+
+
     @SneakyThrows
-    public void testRemoveInvisibleText() {
+    private String testOCR(String fileName) {
 
-        String fileName = "ocr/OCR Docs/MK244 - Fitness of Analytical Method - Physical-Chemical Pro";
-//        String fileName = "InvisiblePathElements";
-
-        ClassPathResource imageInfoResource = new ClassPathResource("files/InvisibleText.IMAGE_INFO.json");
         ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
-
         var originId = FileStorageService.getStorageId("dossier", "file", FileType.ORIGIN);
-        storageService.storeObject(originId, pdfFileResource.getInputStream());
-
-        var imageId = FileStorageService.getStorageId("dossier", "file", FileType.IMAGE_INFO);
-        storageService.storeObject(imageId, imageInfoResource.getInputStream());
-
-        var response = ocrService.ocrDocument("dossier", "file");
-
-        var out = FileUtils.openOutputStream(new File(getTemporaryDirectory() + "/" + fileName + ".pdf"));
-        IOUtils.copy(response, out);
-
-        System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
-    }
-
-
-    @SneakyThrows
-    public void dummyTest() {
-
-        // Build needs one text to not fail.
-        assertThat(1).isEqualTo(1);
-    }
-
-
-    @AfterEach
-    public void cleanupStorage() {
-
-        if (this.storageService instanceof FileSystemBackedStorageService) {
-            ((FileSystemBackedStorageService) this.storageService).clearStorage();
+        try (var fileStream = pdfFileResource.getInputStream()) {
+            storageService.storeObject(TenantContext.getTenantId(), originId, fileStream);
         }
-    }
-
-
-    @Configuration
-    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
-    public static class TestConfiguration {
-
-        @Bean
-        @Primary
-        public StorageService inmemoryStorage() {
-
-            return new FileSystemBackedStorageService();
+        try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
+            ocrService.runOcrOnDocument("dossier", "file", out);
+            System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
         }
 
+        try (var fileStream = new FileInputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
+            return extractAllTextFromDocument(fileStream);
+        }
     }
-
 }

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/service/ImagePositionRetrievalServiceTest.java

@@ -0,0 +1,165 @@
+package com.iqser.red.service.ocr.v1.server.service;
+
+import static com.iqser.red.service.ocr.v1.server.utils.OsUtils.getTemporaryDirectory;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfDraw.drawGrid;
+import static com.iqser.red.service.ocr.v1.server.utils.PdfDraw.drawRectCollection;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+
+import com.iqser.red.service.ocr.v1.server.AbstractTest;
+import com.pdftron.common.PDFNetException;
+import com.pdftron.pdf.ElementWriter;
+import com.pdftron.pdf.PDFDoc;
+import com.pdftron.pdf.RectCollection;
+import com.pdftron.sdf.SDFDoc;
+
+import lombok.SneakyThrows;
+
+
+class ImagePositionRetrievalServiceTest extends AbstractTest {
+
+    @Autowired
+    private ImagePositionRetrievalService imagePositionRetrievalService;
+
+    @Test
+    @SneakyThrows
+    public void testImagePositionRetrievalForRotateTestFileWithImages() {
+
+        String fileName = "RotateTestFileWithImages";
+
+        List<int[]> allRectCoords = testImagePositionDetection(fileName);
+
+        assertThat(allRectCoords).contains(new int[]{48, 572, 295, 721},
+                new int[]{54, 279, 301, 428},
+                new int[]{360, 173, 509, 419},
+                new int[]{362, 522, 511, 768},
+                new int[]{459, 354, 608, 600},
+                new int[]{145, 404, 392, 553},
+                new int[]{151, 111, 398, 260},
+                new int[]{457, 5, 606, 251},
+                new int[]{395, 480, 545, 726},
+                new int[]{393, 130, 542, 377},
+                new int[]{88, 236, 334, 386},
+                new int[]{82, 530, 328, 679},
+                new int[]{465, 11, 614, 257},
+                new int[]{159, 117, 406, 266},
+                new int[]{467, 360, 617, 607},
+                new int[]{153, 410, 400, 559});
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testImagePositionRetrievalForRotateTestFileWithImagesExtremeCropbox() {
+
+        String fileName = "RotateTestFileWithImagesExtremeCropbox";
+
+        List<int[]> allRectCoords = testImagePositionDetection(fileName);
+        assertThat(allRectCoords).contains(new int[]{48, 572, 295, 721},
+                new int[]{362, 522, 511, 768},
+                new int[]{360, 173, 509, 419},
+                new int[]{54, 279, 301, 428},
+                new int[]{145, 192, 392, 341},
+                new int[]{459, 142, 608, 388},
+                new int[]{457, -207, 606, 39},
+                new int[]{151, -101, 398, 48},
+                new int[]{-30, 238, 216, 387},
+                new int[]{283, 188, 433, 434},
+                new int[]{281, -162, 430, 85},
+                new int[]{-24, -56, 222, 94},
+                new int[]{-39, 410, 208, 559},
+                new int[]{275, 360, 425, 607},
+                new int[]{273, 11, 422, 257},
+                new int[]{-33, 117, 214, 266});
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testMergeImages() {
+
+        String fileName = "merge_images";
+        List<int[]> allRectCoords = testImagePositionDetection(fileName);
+        assertThat(allRectCoords).contains(new int[]{90, 284, 398, 770});
+    }
+
+
+    @Test
+    @SneakyThrows
+    public void testStitchedImagesMultiPage() {
+
+        String fileName = "StitchedImagesMultiPage";
+        List<int[]> allRectCoords = testImagePositionDetection(fileName);
+        assertThat(allRectCoords.size()).isEqualTo(48);
+    }
+
+    @Test
+    @SneakyThrows
+    public void testEveryPointInDashedLineIsImage() {
+        String fileName = "everyPointInDashedLineIsImage";
+        List<int[]> allRectCoords = testImagePositionDetection(fileName);
+        assertThat(allRectCoords.size()).isEqualTo(0);
+    }
+
+
+    private List<int[]> testImagePositionDetection(String fileName) throws IOException, PDFNetException {
+
+        try (InputStream fileStream = new FileInputStream(new ClassPathResource("files/" + fileName + ".pdf").getFile().getAbsolutePath())) {
+            PDFDoc pdfDoc = new PDFDoc(fileStream);
+
+            Map<Integer, RectCollection> pageIdToRectCollection = imagePositionRetrievalService.getImagePositionPerPage(pdfDoc, false);
+
+            ElementWriter writer = new ElementWriter();
+            pageIdToRectCollection.forEach((pageId, rectCollection) -> {
+                try {
+                    writer.begin(pdfDoc.getPage(pageId));
+                    drawRectCollection(writer, rectCollection);
+                    drawGrid(writer, pdfDoc.getPage(pageId));
+                    writer.end();
+                    StringBuilder zonesString = new StringBuilder();
+                    for (int j = 0; j < rectCollection.getNumRects(); ++j) {
+                        var r = rectCollection.getRectAt(j);
+                        zonesString.append(String.format("%d:[lower left (%.1f|%.1f) upper right (%.1f|%.1f)]; ", j, r.getX1(), r.getY1(), r.getX2(), r.getY2()));
+                    }
+                    System.out.printf("Page %d: rotation: %d OCR regions %s \n", pageId, pdfDoc.getPage(pageId).getRotation(), zonesString);
+                } catch (PDFNetException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+
+            // Check visually for red Rectangles to match images in the saved pdf file
+            try (var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf")) {
+                out.write(pdfDoc.save(SDFDoc.SaveMode.LINEARIZED, null));
+            }
+            pdfDoc.close();
+            System.out.println("result file: " + getTemporaryDirectory() + "/" + fileName + "_IMAGE_BBOX.pdf");
+            // round all coords to nearest int to account for inconsistencies with the calculation of the bounding box
+            return pageIdToRectCollection.values().stream().map(this::toRoundedCoordinateArrayList).flatMap(List::stream).collect(Collectors.toList());
+        }
+    }
+
+
+    @SneakyThrows
+    private List<int[]> toRoundedCoordinateArrayList(RectCollection rectCollection) {
+
+        List<int[]> coords = new ArrayList<>(rectCollection.getNumRects());
+        for (int i = 0; i < rectCollection.getNumRects(); ++i) {
+            var r = rectCollection.getRectAt(i);
+            coords.add(new int[]{(int) Math.round(r.getX1()), (int) Math.round(r.getY1()), (int) Math.round(r.getX2()), (int) Math.round(r.getY2())});
+        }
+        return coords;
+    }
+
+}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/service/InvisibleElementRemovalServiceTest.java

@@ -0,0 +1,51 @@
+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 org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.io.FileInputStream;
+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;
+
+
+    @Test
+    @SneakyThrows
+    public void testRemoveInvisibleText() {
+
+        String fileName = "InvisibleText";
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/" + fileName + ".pdf");
+
+        try (var initialFileStream = pdfFileResource.getInputStream(); var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
+            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out, false);
+        }
+
+        try (var initialFileStream = pdfFileResource.getInputStream(); var out = new FileOutputStream(getTemporaryDirectory() + "/" + fileName + "_delta.pdf")) {
+            invisibleElementRemovalService.removeInvisibleElements(initialFileStream, out, true);
+        }
+
+        System.out.println("Output File without invisible elements: files/" + fileName + ".pdf");
+        System.out.println("Output Delta File without invisible elements: files/" + fileName + "_delta.pdf");
+
+        try (var fileStream = new FileInputStream(getTemporaryDirectory() + "/" + fileName + ".pdf")) {
+            String[] text = extractAllTextFromDocument(fileStream).split("\n");
+            assertThat(text).contains("APPENDIX 16 Pathology Report", "Amendment 1", "Page 255 of 260");
+        }
+
+    }
+}

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/FileSystemBackedStorageService.java

@@ -32,7 +32,7 @@ public class FileSystemBackedStorageService implements StorageService {
 
     @SneakyThrows
     @Override
-    public InputStreamResource getObject(String objectId) {
+    public InputStreamResource getObject(String tenantId, String objectId) {
 
         var res = dataMap.get(objectId);
         if (res == null) {
@@ -44,28 +44,22 @@ public class FileSystemBackedStorageService implements StorageService {
 
 
     @Override
-    public void deleteObject(String objectId) {
+    public void deleteObject(String tenantId, String objectId) {
 
         dataMap.remove(objectId);
     }
 
 
     @Override
-    public boolean objectExists(String objectId) {
+    public boolean objectExists(String tenantId, String objectId) {
 
         return dataMap.containsKey(objectId);
     }
 
 
-    @Override
-    public void init() {
-
-    }
-
-
     @Override
     @SneakyThrows
-    public <T> void storeJSONObject(String objectId, T any) {
+    public <T> void storeJSONObject(String tenantId, String objectId, T any) {
 
         File tempFile = File.createTempFile("test", ".tmp");
         getMapper().writeValue(new FileOutputStream(tempFile), any);
@@ -81,7 +75,7 @@ public class FileSystemBackedStorageService implements StorageService {
 
     @Override
     @SneakyThrows
-    public <T> T readJSONObject(String objectId, Class<T> clazz) {
+    public <T> T readJSONObject(String tenantId, String objectId, Class<T> clazz) {
 
         if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) {
             throw new StorageObjectDoesNotExist("Stored object not found");
@@ -104,7 +98,7 @@ public class FileSystemBackedStorageService implements StorageService {
 
     @Override
     @SneakyThrows
-    public void storeObject(String objectId, InputStream stream) {
+    public void storeObject(String tenantId, String objectId, InputStream stream) {
 
         File tempFile = File.createTempFile("test", ".tmp");
 

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/PdfDraw.java

@@ -0,0 +1,74 @@
+package com.iqser.red.service.ocr.v1.server.utils;
+
+import com.pdftron.pdf.ColorPt;
+import com.pdftron.pdf.ColorSpace;
+import com.pdftron.pdf.Element;
+import com.pdftron.pdf.ElementBuilder;
+import com.pdftron.pdf.ElementWriter;
+import com.pdftron.pdf.Page;
+import com.pdftron.pdf.Rect;
+import com.pdftron.pdf.RectCollection;
+
+import lombok.SneakyThrows;
+
+
+public class PdfDraw {
+
+    @SneakyThrows
+    public static void drawGrid(ElementWriter writer, Page page) {
+
+        ElementBuilder eb = new ElementBuilder();
+        double dX = 15;
+        double dY = 15;
+        int nRows = (int) (page.getPageHeight() / dY) + 1;
+        int nCols = (int) (page.getPageWidth() / dX) + 1;
+        for (int row = 0; row < nRows; ++row) {
+            for (int col = 0; col < nCols; ++col) {
+                Element cell = eb.createRect(col * dX, row * dY, dX, dY);
+                cell.setPathStroke(true);
+                cell.getGState().setLineWidth(1);
+                cell.getGState().setStrokeOpacity(0.1);
+                cell.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
+                if (row == 0 && col == 0) {
+                    cell.getGState().setStrokeColor(new ColorPt(0, 0, 1));
+                    cell.setPathFill(true);
+                    cell.getGState().setFillOpacity(0.8);
+                    cell.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
+                    cell.getGState().setFillColor(new ColorPt(0, 0, 1));
+                } else {
+                    cell.setPathFill(false);
+                    cell.getGState().setStrokeColor(new ColorPt(0.1, 0.1, 0.1));
+                }
+                writer.writePlacedElement(cell);
+            }
+        }
+        eb.destroy();
+    }
+
+
+    @SneakyThrows
+    public static void drawRectCollection(ElementWriter writer, RectCollection rectCollection) {
+
+        ColorPt colorPt = new ColorPt(1, 0, 0);
+        ElementBuilder eb = new ElementBuilder();
+        for (int i = 0; i < rectCollection.getNumRects(); ++i) {
+            Rect r = rectCollection.getRectAt(i);
+            Element rect = eb.createRect(r.getX1(), r.getY1(), r.getWidth(), r.getHeight());
+
+            rect.setPathStroke(true);
+            rect.getGState().setLineWidth(5);
+            rect.getGState().setStrokeColorSpace(ColorSpace.createDeviceRGB());
+            rect.getGState().setStrokeColor(colorPt);
+
+            rect.setPathFill(true);
+            rect.getGState().setFillColorSpace(ColorSpace.createDeviceRGB());
+            rect.getGState().setFillColor(colorPt);
+            rect.getGState().setFillOpacity(0.5);
+
+            writer.writePlacedElement(rect);
+        }
+        colorPt.destroy();
+        eb.destroy();
+    }
+
+}

ocr-service-v1/ocr-service-server-v1/src/test/resources/application.yml

@@ -5,4 +5,13 @@ spring:
     allow-circular-references: true # FIXME
 
 
-pdftron.license: demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a
+pdftron.license: demo:1650351709282:7bd235e003000000004ec28a6743e1163a085e2115de2536ab6e2cfe5a
+
+
+management:
+  endpoint:
+    metrics.enabled: true
+    prometheus.enabled: true
+    health.enabled: true
+  endpoints.web.exposure.include: prometheus, health, metrics
+  metrics.export.prometheus.enabled: true

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/CropboxNotEqualToMediaBox.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": [{"classification": {"label": "signature", "probabilities": {"signature": 0.9927, "logo": 0.0038, "other": 0.0034, "formula": 0.0}}, "representation": "FFF2CF0F7C74FFC1070830FFF", "position": {"x1": -7, "x2": 603, "y1": 0, "y2": 852, "pageNumber": 1}, "geometry": {"width": 610, "height": 852}, "alpha": false, "filters": {"geometry": {"imageSize": {"quotient": 1.0096, "tooLarge": true, "tooSmall": false}, "imageFormat": {"quotient": 0.716, "tooTall": false, "tooWide": false}}, "probability": {"unconfident": false}, "allPassed": false}}], "dataCV": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/Fm1Debug1.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/InvisiblePathElements.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/InvisibleText.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/InvisibleTextWStar1.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/MediaBoxBiggerThanCropBox.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "d7f1e0e37cba4e28ebdf894a79d3bd67", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": [{"classification": {"label": "signature", "probabilities": {"signature": 0.9872, "logo": 0.0064, "other": 0.0063, "formula": 0.0001}}, "representation": "FFFCF10608F6F89747BFFC301", "position": {"x1": -9, "x2": 584, "y1": 9, "y2": 849, "pageNumber": 1}, "geometry": {"width": 593, "height": 840}, "alpha": false, "filters": {"geometry": {"imageSize": {"quotient": 0.9992, "tooLarge": true, "tooSmall": false}, "imageFormat": {"quotient": 0.706, "tooTall": false, "tooWide": false}}, "probability": {"unconfident": false}, "allPassed": false}}], "dataCV": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/PathOperatorDebugFile.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/PathOperatorDebugFileText.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "917b9d9c9f548f85fef3679db45ff46c", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/Watermark.IMAGE_INFO.json

@@ -1 +0,0 @@
-{"dossierId": "55547c91-6b0e-4aa6-9009-2e7c4cd90f13", "fileId": "32b19ec38896f5105c09041def470c90", "targetFileExtension": "ORIGIN.pdf.gz", "responseFileExtension": "IMAGE_INFO.json.gz", "data": [{"classification": {"label": "logo", "probabilities": {"logo": 0.9999, "signature": 0.0001, "formula": 0.0, "other": 0.0}}, "representation": "307EF8F6E9833CE9D7AF9EFFF", "position": {"x1": 26, "x2": 586, "y1": -2, "y2": 794, "pageNumber": 1}, "geometry": {"width": 560, "height": 796}, "alpha": false, "filters": {"geometry": {"imageSize": {"quotient": 0.959, "tooLarge": true, "tooSmall": false}, "imageFormat": {"quotient": 0.7035, "tooTall": false, "tooWide": false}}, "probability": {"unconfident": false}, "allPassed": false}}, {"classification": {"label": "logo", "probabilities": {"logo": 1.0, "formula": 0.0, "other": 0.0, "signature": 0.0}}, "representation": "FFF7FFD2000000018F3FFEFFF", "position": {"x1": 90, "x2": 210, "y1": 676, "y2": 720, "pageNumber": 1}, "geometry": {"width": 120, "height": 44}, "alpha": false, "filters": {"geometry": {"imageSize": {"quotient": 0.1044, "tooLarge": false, "tooSmall": false}, "imageFormat": {"quotient": 2.7273, "tooTall": false, "tooWide": false}}, "probability": {"unconfident": false}, "allPassed": true}}], "dataCV": []}

ocr-service-v1/ocr-service-server-v1/src/test/resources/files/abc

@@ -1,235 +0,0 @@
-
-0 TL
-q
-    q
-        150 0 m
-        400 0 l
-        400 300 l
-        150 300 l
-        h
-        58 50 m
-        58 200 l
-        570 200 l
-        570 50 l
-        F
-        W
-        n
-        BT
-        -0.011 Tc
-        0 Tw
-        100 Tz
-        /C2_0 12 Tf
-        0 Tr
-        0 Ts
-        485.52 66.48 Td
-        (\0003\000D\000J\000H\000\003) Tj
-        0 Tc
-        26.4 0 Td
-        (\000\024) Tj
-        0.24 Tc
-        8.88 0 Td
-        (\000R\000I) Tj
-        0 Tc
-        9.84 0 Td
-        [(\000\003)-10(\000\030)] TJ
-        0.078 Tc
-        -440.88 -27.6 Td
-        (\0006\000W\000X\000G\000\\) Tj
-        -0.007 Tc
-        30.96 0 Td
-        (\0001\000X\000P\000E\000H\000U\000\035\000\003\000\003) Tj
-        -0.014 Tc
-        48.72 0 Td
-        (\0007\0000\0005\000\023\000\024\000\027\000\025) Tj
-        ET
-        q
-            154.32 0 0 76.32 385.68 643.68 cm
-            /Im0 Do
-        Q
-        BT
-        0.013 Tc
-        /C2_1 12 Tf
-        288.96 601.44 Td
-        (\0006\000X\000E\000V\000W\000D\000Q\000F\000H) Tj
-        0 Tc
-        -168.24 -27.6 Td
-        [(\0006\000<\0001\000\030\000\027\000\031\000\026\000\026\000\023\000\003)-10(\000\261)] TJ
-        ET
-        q
-            192.96 584.88 317.52 -13.92  re
-            W
-            n
-            BT
-            -0.006 Tc
-            192.96 573.84 Td
-            (\0007\000R\000[\000L\000F\000L\000W\000\\\000\003\0006\000W\000X\000G\000\\\000\003\000E\000\\\000\003\000'\000H\000U\000P\000D\000O\000\003\000$\000G\000P\000L\000Q\000L\000V\000W\000U\000D\000W\000L\000R\000Q\000\003\000W\000R\000\003\000+\000D\000Q\000\003\000:\000L\000V\000W\000D\000U\000\003\0005\000D\000W\000V\000\003) Tj
-            ET
-        Q
-        BT
-        -0.024 Tc
-        284.4 560.16 Td
-        (\000I\000R\000U\000\003\000\027\000\003\000:\000H\000H\000N\000V) Tj
-        -0.011 Tc
-        -14.4 -27.6 Td
-        (\0003\000D\000W\000K\000R\000O\000R\000J\000\\\000\003\0005\000H\000S\000R\000U\000W) Tj
-        ET
-        117.12 630 0.72 -3.6  re
-        f*
-        117.12 630 2.16 -0.72  re
-        f*
-        118.56 628.56 0.72 -2.16  re
-        f*
-        118.56 628.56 0.72 -0.72  re
-        f*
-        119.28 630 390.96 -0.72  re
-        f*
-        119.28 628.56 390.96 -0.72  re
-        f*
-        511.68 630 0.72 -3.6  re
-        f*
-        510.24 630 2.16 -0.72  re
-        f*
-        510.24 628.56 0.72 -2.16  re
-        f*
-        510.24 628.56 0.72 -0.72  re
-        f*
-        118.56 626.4 0.72 -111.84  re
-        f*
-        117.12 626.4 0.72 -111.84  re
-        f*
-        117.12 514.56 0.72 -2.16  re
-        f*
-        117.12 513.12 2.16 -0.72  re
-        f*
-        118.56 514.56 0.72 -0.72  re
-        f*
-        118.56 514.56 0.72 -0.72  re
-        f*
-        119.28 513.12 390.96 -0.72  re
-        f*
-        119.28 514.56 390.96 -0.72  re
-        f*
-        511.68 626.4 0.72 -111.84  re
-        f*
-        510.24 626.4 0.72 -111.84  re
-        f*
-        511.68 514.56 0.72 -2.16  re
-        f*
-        510.24 513.12 2.16 -0.72  re
-        f*
-        510.24 514.56 0.72 -0.72  re
-        f*
-        510.24 514.56 0.72 -0.72  re
-        f*
-        BT
-        0.011 Tc
-        89.76 266.64 Td
-        (\000$\0008\0007\000+\0002\0005\000\013\0006\000\f\000\035) Tj
-        -0.012 Tc
-        /C2_0 12 Tf
-        184.8 0.24 Td
-        (\0000\000L\000F\000K\000H\000O\000D\000\003\000*\000U\000H\000J\000R\000U\000L\000\003) Tj
-        -0.037 Tc
-        82.56 0 Td
-        (\000'\0009\0000\000\003\0003\000K\000'\000\003) Tj
-        0.101 Tc
-        55.2 0 Td
-        (\0003\000D\000W\000K\000R\000O) Tj
-        -0.02 Tc
-        30.72 0 Td
-        (\000R\000J\000L\000V\000W) Tj
-        -0.01 Tc
-        /C2_1 12 Tf
-        -353.28 -27.84 Td
-        (\000&\0002\0000\0003\000/\000\(\0007\000,\0002\0001\000\003\000'\000$\0007\000\(\000\035) Tj
-        -0.009 Tc
-        /C2_0 12 Tf
-        184.8 0.24 Td
-        (\000\023\000\030\000\003\0000\000D\000U\000F\000K\000\003\000\025\000\023\000\024\000\033) Tj
-        /C2_1 12 Tf
-        -184.8 -27.84 Td
-        (\000/\000$\000%\0002\0005\000$\0007\0002\0005\000<\000\003\0003\0005\0002\000-\000\(\000&\0007\000\003\000,) Tj
-        -0.026 Tc
-        152.4 0 Td
-        (\000'\000\035) Tj
-        0.009 Tc
-        /C2_0 12 Tf
-        32.4 0.24 Td
-        (\0005\000H\000S\000R\000U\000W\000\003\0001\000X\000P\000E) Tj
-        0.021 Tc
-        65.52 0 Td
-        (\000H\000U\000\035\000\003) Tj
-        -0.014 Tc
-        15.84 0 Td
-        (\0007\0000\0005\000\023\000\024\000\027\000\025) Tj
-        0.078 Tc
-        -81.36 -13.68 Td
-        (\0006\000W\000X\000G\000\\) Tj
-        -0.011 Tc
-        27.84 0 Td
-        (\000\003\0001\000X\000P\000E\000H\000U\000\035) Tj
-        -0.014 Tc
-        48.72 0 Td
-        (\0007\0000\0005\000\023\000\024\000\027\000\025) Tj
-        -0.008 Tc
-        -76.56 -13.92 Td
-        (\0007\000D\000V\000N\000\003\0001\000X\000P\000E\000H\000U\000\035\000\003) Tj
-        -0.019 Tc
-        72 0 Td
-        (\0007\000.\000\023\000\025\000\024\000\023\000\024\000\031\000\033) Tj
-        0 Tc
-        /C2_1 12 Tf
-        -256.8 -27.84 Td
-        [(\0009\0002\000/\0008\0000\000\(\000\003)-10(\000\024)] TJ
-        -0.052 Tc
-        66.24 0 Td
-        (\0002\000\)\000\003) Tj
-        0 Tc
-        19.68 0 Td
-        (\000\024) Tj
-        -0.01 Tc
-        8.88 0 Td
-        (\0002\000\)\000\003\0006\0007\0008\000'\000<) Tj
-        ET
-        146.88 155.04 6 -1.2  re
-        f*
-        175.68 155.04 5.76 -1.2  re
-        f*
-        BT
-        -0.053 Tc
-        89.76 142.56 Td
-        (\0003\000$\000*\000\(\000\003) Tj
-        0 Tc
-        36.24 0 Td
-        (\000\024) Tj
-        -0.052 Tc
-        9.12 0 Td
-        (\0002\000\)\000\003) Tj
-        0 Tc
-        19.68 0 Td
-        (\000\030) Tj
-        ET
-        126 141.36 6 -1.2  re
-        f*
-        154.8 141.36 6 -1.2  re
-        f*
-        /Artifact <</Subtype/Watermark/Type/Pagination>> BDC
-        q
-            /G0 gs
-            0.940613 0 0 0.940613 26.0628 0 cm
-            0 0 0 RG
-            0 w
-            /Fm0 Do
-        Q
-        EMC
-        /Artifact <</Contents( Page 250 of 256)/Subtype/Header/Type/Pagination>> BDC
-        q
-            /G0 gs
-            1 0 0 1 458.67 48.412 cm
-            0 0 0 RG
-            0 w
-            /Fm1 Do
-        Q
-        EMC
-    Q
-Q

ocr-service-v1/ocr-service-server-v1/src/test/resources/log4j2-test.xml

@@ -0,0 +1,16 @@
+<Configuration>
+
+    <Appenders>
+        <Console name="CONSOLE" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Root level="warn">
+            <AppenderRef ref="CONSOLE"/>
+        </Root>
+        <Logger name="com.iqser" level="info"/>
+    </Loggers>
+
+</Configuration>

ocr-service-v1/pom.xml

@@ -7,13 +7,13 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-dependency</artifactId>
-        <version>1.14.0</version>
+        <version>2.2.0</version>
         <relativePath/>
     </parent>
 
     <groupId>com.iqser.red.service</groupId>
     <artifactId>ocr-service-v1</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.20.0</version>
+                <version>2.1.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.0.2155</version>
+                    <version>3.9.1.2184</version>
                 </plugin>
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
-                    <version>6.3.1</version>
+                    <version>8.1.2</version>
                     <configuration>
                         <format>ALL</format>
                     </configuration>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.iqser.red.service</groupId>
     <artifactId>ocr-service</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>