From c00e9290bc24dc39f7473672191933557e0271c9 Mon Sep 17 00:00:00 2001
From: devplant <corina@devplant.ro>
Date: Thu, 6 Apr 2023 11:52:44 +0300
Subject: [PATCH 1/4] RED-5694 - Upgrade spring-boot to 3.0 - update
 platform-dependency - update other dependencies versions to the latest

---
 ocr-service-image-v1/pom.xml                  |  2 +-
 ocr-service-v1/ocr-service-api-v1/pom.xml     |  8 --------
 ocr-service-v1/ocr-service-server-v1/pom.xml  | 11 +++++-----
 .../server/initializer/PDFNetInitializer.java |  5 +++--
 .../model/image/ImageServiceResponse.java     |  5 -----
 .../EncryptionDecryptionService.java          |  2 +-
 .../v1/server/service/OcrMessageReceiver.java |  1 -
 .../service/ocr/v1/server/AbstractTest.java   | 20 +++++++++++++++++--
 ocr-service-v1/pom.xml                        |  8 ++++----
 9 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/ocr-service-image-v1/pom.xml b/ocr-service-image-v1/pom.xml
index 3d6d18d..fcf0ec3 100644
--- a/ocr-service-image-v1/pom.xml
+++ b/ocr-service-image-v1/pom.xml
@@ -12,7 +12,7 @@
 
     <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>
diff --git a/ocr-service-v1/ocr-service-api-v1/pom.xml b/ocr-service-v1/ocr-service-api-v1/pom.xml
index a321616..dc3c1a0 100644
--- a/ocr-service-v1/ocr-service-api-v1/pom.xml
+++ b/ocr-service-v1/ocr-service-api-v1/pom.xml
@@ -14,18 +14,10 @@
 
     <properties>
         <persistence-service.version>2.1.0</persistence-service.version>
-        <dsljson.version>1.9.9</dsljson.version>
     </properties>
 
     <dependencies>
 
-        <!-- https://mvnrepository.com/artifact/com.dslplatform/dsl-json-java8 -->
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-java8</artifactId>
-            <version>${dsljson.version}</version>
-        </dependency>
-
         <dependency>
             <!-- This dependency contains annotations that are used in specifying REST endpoints. -->
             <!-- It is optional since not all users of this API might use Feign. -->
diff --git a/ocr-service-v1/ocr-service-server-v1/pom.xml b/ocr-service-v1/ocr-service-server-v1/pom.xml
index 052cade..5b4d773 100644
--- a/ocr-service-v1/ocr-service-server-v1/pom.xml
+++ b/ocr-service-v1/ocr-service-server-v1/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>pdftron-logic-commons</artifactId>
-            <version>1.1.0</version>
+            <version>2.1.0</version>
         </dependency>
 
         <dependency>
@@ -44,17 +44,17 @@
         <dependency>
             <groupId>com.pdftron</groupId>
             <artifactId>PDFNet</artifactId>
-            <version>9.4.0</version>
+            <version>9.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>2.3.1.RELEASE</version>
+            <version>3.0.5</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>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
+            <version>3.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -115,7 +115,6 @@
                 <configuration>
                     <annotationProcessors>
                         <annotationProcessor>lombok.launch.AnnotationProcessorHider$AnnotationProcessor</annotationProcessor>
-                        <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor</annotationProcessor>
                     </annotationProcessors>
                 </configuration>
             </plugin>
diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
index 9fa6654..b298894 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
@@ -1,13 +1,14 @@
 package com.iqser.red.service.ocr.v1.server.initializer;
 
+import com.iqser.red.service.ocr.v1.server.settings.PdfTronOcrServiceSettings;
 import com.pdftron.pdf.PDFNet;
+
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
-
 @Component
 @RequiredArgsConstructor
 public class PDFNetInitializer {
diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageServiceResponse.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageServiceResponse.java
index 4bc072e..fbb8bd7 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/image/ImageServiceResponse.java
+++ b/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;}
 
 }
diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/EncryptionDecryptionService.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/EncryptionDecryptionService.java
index 1c7acec..f9056b5 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/EncryptionDecryptionService.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/multitenancy/EncryptionDecryptionService.java
@@ -6,7 +6,6 @@ import java.security.SecureRandom;
 import java.security.spec.KeySpec;
 import java.util.Base64;
 
-import javax.annotation.PostConstruct;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
@@ -17,6 +16,7 @@ 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
diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java
index 3500929..65c2033 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OcrMessageReceiver.java
@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.ocr.v1.api.model.DocumentRequest;
 import com.iqser.red.service.ocr.v1.server.client.FileStatusProcessingUpdateClient;
 import com.iqser.red.service.ocr.v1.server.configuration.MessagingConfiguration;
-import com.iqser.red.service.ocr.v1.server.initializer.PDFNetInitializer;
 import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
index 61a23a2..a3d0ca5 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
@@ -9,24 +9,30 @@ 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)
+@Import({AbstractTest.TestConfiguration.class, PDFNetInitializer.class})
+@AutoConfigureObservability
 public class AbstractTest {
 
     @Autowired
@@ -35,6 +41,15 @@ public class AbstractTest {
     @MockBean
     protected RabbitTemplate rabbitTemplate;
 
+//    @Value("${pdftron.license:}")
+    private static String pdftronLicense;
+
+    @PostConstruct
+    @SneakyThrows
+    public void init() {
+        PDFNet.initialize(pdftronLicense);
+    }
+
 
     @AfterAll
     public static void terminatePDFNet() {
@@ -62,7 +77,8 @@ public class AbstractTest {
 
 
     @Configuration
-    @EnableAutoConfiguration(exclude = {StorageAutoConfiguration.class, RabbitAutoConfiguration.class})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @ComponentScan(excludeFilters={@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value=StorageAutoConfiguration.class)})
     public static class TestConfiguration {
 
         @Bean
diff --git a/ocr-service-v1/pom.xml b/ocr-service-v1/pom.xml
index 431be0c..d4a3f75 100644
--- a/ocr-service-v1/pom.xml
+++ b/ocr-service-v1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-dependency</artifactId>
-        <version>1.17.0</version>
+        <version>2.2.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.22.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>

From 17b19329266bb7fe2432178df611c0e68e1681c0 Mon Sep 17 00:00:00 2001
From: devplant <corina@devplant.ro>
Date: Thu, 6 Apr 2023 11:57:36 +0300
Subject: [PATCH 2/4] RED-5694 - Upgrade spring-boot to 3.0 - remove unused
 import

---
 .../red/service/ocr/v1/server/initializer/PDFNetInitializer.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
index b298894..8026147 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/initializer/PDFNetInitializer.java
@@ -1,6 +1,5 @@
 package com.iqser.red.service.ocr.v1.server.initializer;
 
-import com.iqser.red.service.ocr.v1.server.settings.PdfTronOcrServiceSettings;
 import com.pdftron.pdf.PDFNet;
 
 import jakarta.annotation.PostConstruct;

From 81fd35f9c044bd5c47b363419c0d4a51d3698602 Mon Sep 17 00:00:00 2001
From: devplant <corina@devplant.ro>
Date: Thu, 6 Apr 2023 13:35:42 +0300
Subject: [PATCH 3/4] RED-5694 - Upgrade spring-boot to 3.0 - remove versions
 already defined in spring boot

---
 ocr-service-v1/ocr-service-server-v1/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ocr-service-v1/ocr-service-server-v1/pom.xml b/ocr-service-v1/ocr-service-server-v1/pom.xml
index 5b4d773..83f57fd 100644
--- a/ocr-service-v1/ocr-service-server-v1/pom.xml
+++ b/ocr-service-v1/ocr-service-server-v1/pom.xml
@@ -49,7 +49,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>3.0.5</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
@@ -70,7 +69,6 @@
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit-test</artifactId>
-            <version>3.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -86,7 +84,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
         </dependency>
     </dependencies>
     <build>

From f72001c4ac0431c482cc467e948bdc972643d785 Mon Sep 17 00:00:00 2001
From: devplant <corina@devplant.ro>
Date: Thu, 6 Apr 2023 13:36:43 +0300
Subject: [PATCH 4/4] RED-5694 - Upgrade spring-boot to 3.0 - remove commented
 code

---
 .../java/com/iqser/red/service/ocr/v1/server/AbstractTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
index a3d0ca5..f521729 100644
--- a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
+++ b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/AbstractTest.java
@@ -41,7 +41,6 @@ public class AbstractTest {
     @MockBean
     protected RabbitTemplate rabbitTemplate;
 
-//    @Value("${pdftron.license:}")
     private static String pdftronLicense;
 
     @PostConstruct