From 5d211fb4c38b16115a45559fb4073c9e589f86ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <deiflaender@dominiques-mbp.speedport.ip>
Date: Wed, 6 Oct 2021 15:40:03 +0200
Subject: [PATCH] RED-2172: Enbled to configure azure blob storage as storage
 backend

---
 search-service-v1/pom.xml                                | 4 ++--
 .../src/main/resources/application.yml                   | 1 +
 .../service/AbstractElasticsearchIntegrationTest.java    | 3 ++-
 .../server/service/FileSystemBackedStorageService.java   | 4 ++--
 .../src/test/resources/application.yml                   | 9 ++++++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/search-service-v1/pom.xml b/search-service-v1/pom.xml
index 220093e..f7a4e95 100644
--- a/search-service-v1/pom.xml
+++ b/search-service-v1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.1.4</version>
+        <version>1.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>com.iqser.red</groupId>
                 <artifactId>platform-commons-dependency</artifactId>
-                <version>1.4.0</version>
+                <version>1.6.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/search-service-v1/search-service-server-v1/src/main/resources/application.yml b/search-service-v1/search-service-server-v1/src/main/resources/application.yml
index 54fe63d..e6924cc 100644
--- a/search-service-v1/search-service-server-v1/src/main/resources/application.yml
+++ b/search-service-v1/search-service-server-v1/src/main/resources/application.yml
@@ -45,3 +45,4 @@ storage:
   bucket-name: 'redaction'
   region: 'us-east-1'
   endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'
diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
index 8d7159a..0a33c17 100644
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/AbstractElasticsearchIntegrationTest.java
@@ -21,6 +21,7 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.iqser.red.service.search.v1.server.Application;
 import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
 import com.iqser.red.service.search.v1.server.settings.ElasticsearchSettings;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 
 @DirtiesContext
@@ -42,7 +43,7 @@ public class AbstractElasticsearchIntegrationTest {
     private AmazonS3 amazonS3;
 
     @Configuration
-    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
     @Import(Application.class)
     @EnableFeignClients(basePackageClasses = TestConfiguration.class)
     public static class TestConfiguration {
diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
index 4f3c84b..df5a0a2 100644
--- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
+++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/FileSystemBackedStorageService.java
@@ -10,11 +10,11 @@ import org.apache.commons.io.IOUtils;
 import org.springframework.core.io.InputStreamResource;
 
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
-import com.iqser.red.storage.commons.service.StorageService;
+import com.iqser.red.storage.commons.service.S3StorageService;
 
 import lombok.SneakyThrows;
 
-public class FileSystemBackedStorageService extends StorageService {
+public class FileSystemBackedStorageService extends S3StorageService {
 
     private final Map<String, File> dataMap = new HashMap<>();
 
diff --git a/search-service-v1/search-service-server-v1/src/test/resources/application.yml b/search-service-v1/search-service-server-v1/src/test/resources/application.yml
index e5924a4..2988fc2 100644
--- a/search-service-v1/search-service-server-v1/src/test/resources/application.yml
+++ b/search-service-v1/search-service-server-v1/src/test/resources/application.yml
@@ -6,4 +6,11 @@ logging.level.root: INFO
 
 spring:
   main:
-    allow-bean-definition-overriding: true
\ No newline at end of file
+    allow-bean-definition-overriding: true
+
+storage:
+  signer-type: 'AWSS3V4SignerType'
+  bucket-name: 'redaction'
+  region: 'us-east-1'
+  endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'
\ No newline at end of file