From 4806a316199e16d2857f7659fb0f0e50120f3649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?= Date: Tue, 5 Oct 2021 11:33:08 +0200 Subject: [PATCH] RED-2172: Enbled to configure azure blob storage as storage backend --- .../src/main/resources/application.yml | 1 + .../service/DossierTemplateTesterAndProvider.java | 1 + .../utils/AbstractPersistenceServerServiceTest.java | 7 +++++++ .../integration/utils/FileSystemBackedStorageService.java | 3 ++- .../src/test/resources/application.yml | 1 + persistence-service-v1/pom.xml | 4 ++-- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml index 4ddc12234..28b4b5734 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml @@ -60,4 +60,5 @@ storage: bucket-name: 'redaction' region: 'us-east-1' endpoint: 'https://s3.amazonaws.com' + backend: 's3' diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java index 0ffb8d824..3a15af4dc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java @@ -29,6 +29,7 @@ public class DossierTemplateTesterAndProvider { cru.setRequestingUser("1"); cru.setValidFrom(OffsetDateTime.now()); cru.setValidTo(OffsetDateTime.now()); + cru.setModifiedBy("user"); DossierTemplate result = dossierTemplateClient.createOrUpdateDossierTemplate(cru); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java index da29a3ff5..2bcaddb66 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java @@ -15,6 +15,7 @@ import com.iqser.red.storage.commons.service.StorageService; import org.assertj.core.util.Lists; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -34,6 +35,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; +import java.util.TimeZone; @RunWith(SpringRunner.class) @EnableFeignClients(basePackageClasses = FileClient.class) @@ -101,6 +103,11 @@ public abstract class AbstractPersistenceServerServiceTest { @Autowired private DossierAttributeConfigRepository dossierAttributeConfigRepository; + @BeforeClass + static public void setTimeZone(){ + TimeZone.setDefault(TimeZone.getTimeZone("GMT")); + } + @Before public void setupOptimize() { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FileSystemBackedStorageService.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FileSystemBackedStorageService.java index 2697696b7..0f6e9a125 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FileSystemBackedStorageService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FileSystemBackedStorageService.java @@ -1,6 +1,7 @@ package com.iqser.red.service.peristence.v1.server.integration.utils; import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; +import com.iqser.red.storage.commons.service.S3StorageService; import com.iqser.red.storage.commons.service.StorageService; import lombok.SneakyThrows; import org.apache.commons.io.IOUtils; @@ -13,7 +14,7 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; -public class FileSystemBackedStorageService extends StorageService { +public class FileSystemBackedStorageService extends S3StorageService { private final Map dataMap = new HashMap<>(); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml index cee644845..980811b00 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml @@ -45,6 +45,7 @@ storage: endpoint: 'http://localhost:9000' key: minioadmin secret: minioadmin + backend: 's3' server: diff --git a/persistence-service-v1/pom.xml b/persistence-service-v1/pom.xml index cf3cc7a16..d2a283766 100755 --- a/persistence-service-v1/pom.xml +++ b/persistence-service-v1/pom.xml @@ -6,7 +6,7 @@ com.iqser.red platform-dependency - 1.1.4 + 1.1.5 4.0.0 @@ -28,7 +28,7 @@ com.iqser.red platform-commons-dependency - 1.4.0 + 1.5.0 import pom