From 6d3ec8a9dbe1bced3165d808f3e161f0b9c8ff9d Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Fri, 13 Oct 2023 14:50:31 +0300 Subject: [PATCH] RED-7686 - Specific hidden text in specific file is not removed - upgraded storage-commons, tenant-commons to the newest windows compatible versions --- ocr-service-v1/ocr-service-server-v1/pom.xml | 4 +- .../service/ocr/v1/server/AbstractTest.java | 5 +- .../utils/FileSystemBackedStorageService.java | 118 ------------------ 3 files changed, 5 insertions(+), 122 deletions(-) delete mode 100644 ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/FileSystemBackedStorageService.java diff --git a/ocr-service-v1/ocr-service-server-v1/pom.xml b/ocr-service-v1/ocr-service-server-v1/pom.xml index bfe24ec..f831eef 100644 --- a/ocr-service-v1/ocr-service-server-v1/pom.xml +++ b/ocr-service-v1/ocr-service-server-v1/pom.xml @@ -13,10 +13,10 @@ ocr-service-server-v1 - 0.10.0 + 0.14.0 2.118.0 2.21.0 - 2.33.0 + 2.45.0 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 f003262..7097012 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 @@ -23,12 +23,13 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.test.context.junit.jupiter.SpringExtension; +import com.iqser.red.commons.jackson.ObjectMapperFactory; import com.iqser.red.service.ocr.v1.server.initializer.PDFNetInitializer; import com.iqser.red.service.ocr.v1.server.service.DossierService; import com.iqser.red.service.ocr.v1.server.service.DossierTemplateService; -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.iqser.red.storage.commons.utils.FileSystemBackedStorageService; import com.knecon.fforesight.tenantcommons.TenantsClient; import com.pdftron.pdf.PDFNet; @@ -109,7 +110,7 @@ public class AbstractTest { @Primary public StorageService inMemoryStorage() { - return new FileSystemBackedStorageService(); + return new FileSystemBackedStorageService(ObjectMapperFactory.create()); } } diff --git a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/FileSystemBackedStorageService.java b/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/FileSystemBackedStorageService.java deleted file mode 100644 index 72768b7..0000000 --- a/ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/utils/FileSystemBackedStorageService.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.iqser.red.service.ocr.v1.server.utils; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import org.apache.commons.io.IOUtils; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.commons.jackson.ObjectMapperFactory; -import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; -import com.iqser.red.storage.commons.service.StorageService; - -import lombok.SneakyThrows; - -public class FileSystemBackedStorageService implements StorageService { - - private final Map dataMap = new HashMap<>(); - - - public FileSystemBackedStorageService() { - - } - - - @SneakyThrows - @Override - public void downloadTo(String tenantId, String objectId, File destinationFile) { - - var res = dataMap.get(objectId); - if (res == null) { - throw new StorageObjectDoesNotExist(new RuntimeException()); - } - - IOUtils.copy(new FileInputStream(res), new FileOutputStream(destinationFile)); - } - - - @Override - public void deleteObject(String tenantId, String objectId) { - - dataMap.remove(objectId); - } - - - @Override - public boolean objectExists(String tenantId, String objectId) { - - return dataMap.containsKey(objectId); - } - - - @Override - @SneakyThrows - public void storeJSONObject(String tenantId, String objectId, T any) { - - File tempFile = File.createTempFile("test", ".tmp"); - getMapper().writeValue(new FileOutputStream(tempFile), any); - dataMap.put(objectId, tempFile); - } - - - private ObjectMapper getMapper() { - - return ObjectMapperFactory.create(); - } - - - @Override - @SneakyThrows - public T readJSONObject(String tenantId, String objectId, Class clazz) { - - if (dataMap.get(objectId) == null || !dataMap.get(objectId).exists()) { - throw new StorageObjectDoesNotExist("Stored object not found"); - } - return getMapper().readValue(new FileInputStream(dataMap.get(objectId)), clazz); - } - - - public List listPaths() { - - return new ArrayList<>(dataMap.keySet()); - } - - - public List listFilePaths() { - - return dataMap.values().stream().map(File::getAbsolutePath).collect(Collectors.toList()); - } - - - @Override - @SneakyThrows - public void storeObject(String tenantId, String objectId, InputStream stream) { - - File tempFile = File.createTempFile("test", ".tmp"); - - try (var fileOutputStream = new FileOutputStream(tempFile)) { - IOUtils.copy(stream, fileOutputStream); - } - - dataMap.put(objectId, tempFile); - } - - - public void clearStorage() { - - this.dataMap.forEach((k, v) -> v.delete()); - this.dataMap.clear(); - } - -}