Pull request #39: RED-2172: Enbled to configure azure blob storage as storage backend

Merge in RED/persistence-service from RED-2172 to master

* commit '4806a316199e16d2857f7659fb0f0e50120f3649':
  RED-2172: Enbled to configure azure blob storage as storage backend

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'
 

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);
 

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() {
 

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<String, File> dataMap = new HashMap<>();
 

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:

persistence-service-v1/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-dependency</artifactId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.4.0</version>
+                <version>1.5.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>