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 @@
ocr-service-image-v1
com.iqser.red.service
- 1.0-SNAPSHOT
+ 3.0-SNAPSHOT
pom
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 @@
2.1.0
- 1.9.9
-
-
- com.dslplatform
- dsl-json-java8
- ${dsljson.version}
-
-
diff --git a/ocr-service-v1/ocr-service-server-v1/pom.xml b/ocr-service-v1/ocr-service-server-v1/pom.xml
index 052cade..83f57fd 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 @@
com.iqser.red.commons
pdftron-logic-commons
- 1.1.0
+ 2.1.0
@@ -44,17 +44,16 @@
com.pdftron
PDFNet
- 9.4.0
+ 9.5.0
org.springframework.boot
spring-boot-starter-amqp
- 2.3.1.RELEASE
com.amazonaws
aws-java-sdk-kms
- 1.12.158
+ 1.12.440
com.google.guava
@@ -70,7 +69,6 @@
org.springframework.amqp
spring-rabbit-test
- 2.3.1
test
@@ -86,7 +84,6 @@
org.apache.commons
commons-lang3
- 3.12.0
@@ -115,7 +112,6 @@
lombok.launch.AnnotationProcessorHider$AnnotationProcessor
- com.dslplatform.json.processor.CompiledJsonAnnotationProcessor
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..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,13 +1,13 @@
package com.iqser.red.service.ocr.v1.server.initializer;
import com.pdftron.pdf.PDFNet;
+
+import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-
@Component
@RequiredArgsConstructor
public class PDFNetInitializer {
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 data = new ArrayList<>();
@JsonProperty(value = "imageMetadata")
@JsonAlias("data")
- @JsonAttribute(alternativeNames = {"imageMetadata"})
public void setData(List 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..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
@@ -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,14 @@ public class AbstractTest {
@MockBean
protected RabbitTemplate rabbitTemplate;
+ private static String pdftronLicense;
+
+ @PostConstruct
+ @SneakyThrows
+ public void init() {
+ PDFNet.initialize(pdftronLicense);
+ }
+
@AfterAll
public static void terminatePDFNet() {
@@ -62,7 +76,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 @@
com.iqser.red
platform-dependency
- 1.17.0
+ 2.2.0
@@ -27,7 +27,7 @@
com.iqser.red
platform-commons-dependency
- 1.22.0
+ 2.1.0
import
pom
@@ -39,12 +39,12 @@
org.sonarsource.scanner.maven
sonar-maven-plugin
- 3.9.0.2155
+ 3.9.1.2184
org.owasp
dependency-check-maven
- 6.3.1
+ 8.1.2
ALL