diff --git a/ocr-service-v1/ocr-service-api-v1/pom.xml b/ocr-service-v1/ocr-service-api-v1/pom.xml index 783322f..5b782c0 100644 --- a/ocr-service-v1/ocr-service-api-v1/pom.xml +++ b/ocr-service-v1/ocr-service-api-v1/pom.xml @@ -14,8 +14,7 @@ 1.0-SNAPSHOT - 1.269.0 - 3.155.0 + 2.0.8 1.9.9 @@ -43,26 +42,9 @@ com.iqser.red.service - persistence-service-api-v1 - - - com.iqser.red.service - redaction-service-api-v1 - - + persistence-service-internal-api-v1 ${persistence-service.version} - - com.iqser.red.service - redaction-service-api-v1 - - - com.iqser.red.service - persistence-service-api-v1 - - - ${redaction-service.version} - diff --git a/ocr-service-v1/ocr-service-api-v1/src/test/java/com/iqser/red/service/ocr/v1/api/model/IdentityTest.java b/ocr-service-v1/ocr-service-api-v1/src/test/java/com/iqser/red/service/ocr/v1/api/model/IdentityTest.java new file mode 100644 index 0000000..cda2448 --- /dev/null +++ b/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); + } + +} + diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/client/FileStatusProcessingUpdateClient.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/client/FileStatusProcessingUpdateClient.java index b0c51e8..c12470e 100644 --- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/client/FileStatusProcessingUpdateClient.java +++ b/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 { diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ImagePosition.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ImagePosition.java index 72fa107..88405f8 100644 --- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/model/ImagePosition.java +++ b/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; diff --git a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/FileStorageService.java b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/FileStorageService.java index fa8d6e3..8646000 100644 --- a/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/FileStorageService.java +++ b/ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/FileStorageService.java @@ -7,7 +7,7 @@ import org.apache.commons.io.IOUtils; import org.springframework.stereotype.Service; import com.iqser.red.service.ocr.v1.server.model.image.ImageServiceResponse; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; +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; diff --git a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java index 2c5b1de..90881ff 100644 --- a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java +++ b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java @@ -18,13 +18,15 @@ import org.springframework.core.io.ClassPathResource; 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.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; +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 { @@ -39,13 +41,12 @@ public class OcrServiceIntegrationTest extends AbstractTest { @BeforeEach @SneakyThrows - @Disabled public void assertOCRModuleIsLoaded() { assert OCRModule.isModuleAvailable(); } + @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testOCRMetrics() { testOCR("Watermark"); @@ -61,7 +62,6 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testOcr() { // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there String text = testOCR("StitchedImagesMultiPage"); @@ -69,7 +69,6 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testManyRotatedImages() { // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there String text = testOCR("manyRotatedImages"); @@ -78,7 +77,6 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testMergeImages() { // check visually for most of the images containing text, the resulting text is kind of nonsense, just ensure it is there String text = testOCR("merge_images"); @@ -99,7 +97,6 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testOCRWatermark() { assertThat(testOCR("Watermark")).contains("syngenta"); @@ -107,7 +104,6 @@ public class OcrServiceIntegrationTest extends AbstractTest { @Test - @Disabled // OCRModule is not available on build server. If you want to run the test set the property at the top. public void testOCRInvisibleText() { String text = testOCR("InvisibleText");