RED-2172: Enbled to configure azure blob storage as storage backend

redaction-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>
 
@@ -32,7 +32,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>

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DictionaryService.java

@@ -52,9 +52,11 @@ public class DictionaryService {
     public DictionaryIncrement getDictionaryIncrements(String dossierTemplateId, DictionaryVersion fromVersion, String dossierId) {
 
         DictionaryVersion version = updateDictionary(dossierTemplateId, dossierId);
+        log.info("From version is: {} and version is {}", fromVersion, version);
 
         Set<DictionaryIncrementValue> newValues = new HashSet<>();
         List<DictionaryModel> dictionaryModels = dictionariesByDossierTemplate.get(dossierTemplateId).getDictionary();
+        log.info("Entries" + dictionaryModels.stream().filter(dm -> dm.getType().equals("PII")).findFirst().get().getEntries());
         dictionaryModels.forEach(dictionaryModel -> {
             dictionaryModel.getEntries().forEach(dictionaryEntry -> {
                 if (dictionaryEntry.getVersion() > fromVersion.getDossierTemplateVersion()) {
@@ -62,6 +64,7 @@ public class DictionaryService {
                 }
             });
         });
+        log.info("New Values are: " + newValues);
 
         if(dictionariesByDossier.containsKey(dossierId)) {
             dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();

redaction-service-v1/redaction-service-server-v1/src/main/resources/application.yml

@@ -40,3 +40,4 @@ storage:
   bucket-name: 'redaction'
   region: 'us-east-1'
   endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/FileSystemBackedStorageService.java

@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server;
 
 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;
@@ -12,7 +13,7 @@ import java.io.FileOutputStream;
 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<>();
 

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -21,6 +21,7 @@ import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeServic
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.storage.commons.StorageAutoConfiguration;
 import com.iqser.red.storage.commons.service.StorageService;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
@@ -137,7 +138,7 @@ public class RedactionIntegrationTest {
     private final static String TEST_FILE_ID = "123";
 
     @Configuration
-    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class})
+    @EnableAutoConfiguration(exclude = {RabbitAutoConfiguration.class, StorageAutoConfiguration.class})
     public static class RedactionIntegrationTestConfiguration {
 
         @Bean

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -18,3 +18,10 @@ platform.multi-tenancy:
 redaction-service:
   enable-image-classification: false
   enable-entity-recognition: false
+
+storage:
+  signer-type: 'AWSS3V4SignerType'
+  bucket-name: 'redaction'
+  region: 'us-east-1'
+  endpoint: 'https://s3.amazonaws.com'
+  backend: 's3'