Merge branch 'integration-master' of...

Merge branch 'integration-master' of https://git.epam.com/go3-nrg/platform/System/partition into feature/GONRG-1191_Implement_Partition_Service

partition-core/src/main/java/org/opengroup/osdu/partition/service/CachedPartitionServiceImpl.java

@@ -50,6 +50,7 @@ public class CachedPartitionServiceImpl implements IPartitionService {
 
         if (pi != null) {
             partitionServiceCache.put(partitionId, partitionInfo);
+            partitionListCache.clearAll();
         }
 
         return pi;
@@ -86,6 +87,7 @@ public class CachedPartitionServiceImpl implements IPartitionService {
         if (partitionService.deletePartition(partitionId)) {
             if (partitionServiceCache.get(partitionId) != null) {
                 partitionServiceCache.delete(partitionId);
+                partitionListCache.clearAll();
             }
 
             return true;

partition-core/src/test/java/org/opengroup/osdu/partition/service/CachedPartitionServiceImplTest.java

@@ -52,11 +52,11 @@ public class CachedPartitionServiceImplTest {
         PartitionInfo retPi = PartitionInfo.builder().build();
 
         when(partitionServiceImpl.createPartition(partId, newPi)).thenReturn(retPi);
-
         cachedPartitionServiceImpl.createPartition(partId, newPi);
 
         verify(partitionServiceImpl, times(1)).createPartition(partId, newPi);
         verify(partitionServiceCache, times(1)).put(partId, retPi);
+        verify(partitionListCache, times(1)).clearAll();
     }
 
     @Test
@@ -71,6 +71,7 @@ public class CachedPartitionServiceImplTest {
 
         verify(partitionServiceImpl, times(1)).createPartition(partId, newPi);
         verify(partitionServiceCache, times(0)).put(any(), any());
+        verify(partitionListCache, times(0)).clearAll();
         verify(partitionServiceCache, times(1)).get(any());
     }
 
@@ -131,6 +132,7 @@ public class CachedPartitionServiceImplTest {
         verify(partitionServiceImpl, times(1)).deletePartition(partId);
         verify(partitionServiceCache, times(1)).delete(partId);
         verify(partitionServiceCache, times(1)).get(partId);
+        verify(partitionListCache, times(1)).clearAll();
     }
 
     @Test

provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java

@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.inject.Named;
+import java.util.List;
 
 @Configuration
 public class RedisConfig {
@@ -44,6 +45,11 @@ public class RedisConfig {
             return new RedisCache<>(host, port, password, expiration, database, String.class, PartitionInfo.class);
         }
 
+        @Bean
+        public RedisCache<String, List<String>> partitionListCache(@Named("REDIS_HOST") String host, @Named("REDIS_PASSWORD") String password) {
+            return new RedisCache(host, port, password, expiration, database, String.class, List.class);
+        }
+
     }
 
     @Configuration
@@ -64,5 +70,10 @@ public class RedisConfig {
             return new RedisCache<>(host, port, expiration, database, String.class, PartitionInfo.class);
         }
 
+        @Bean
+        public RedisCache<String, List<String>> partitionListCache(@Named("REDIS_HOST") String host) {
+            return new RedisCache(host, port, expiration, database, String.class, List.class);
+        }
+
     }
 }

provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/VmConfig.java

 package org.opengroup.osdu.partition.provider.azure.di;
 
 import org.opengroup.osdu.core.common.cache.VmCache;
+import org.opengroup.osdu.partition.model.PartitionInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -12,6 +13,7 @@ import java.util.List;
 public class VmConfig {
 
     @Bean
+    @ConditionalOnProperty(value = "cache.provider", havingValue = "vm", matchIfMissing = true)
     public VmCache<String, List<String>> partitionListCache(@Value("${cache.expiration}") final int expiration,
                                                             @Value("${cache.maxSize}") final int maxSize) {
         return new VmCache<>(expiration * 60, maxSize);
@@ -19,8 +21,8 @@ public class VmConfig {
 
     @Bean
     @ConditionalOnProperty(value = "cache.provider", havingValue = "vm", matchIfMissing = true)
-    public VmCache<String, List<String>> partitionServiceCache(@Value("${cache.expiration}") final int expiration,
-                                                            @Value("${cache.maxSize}") final int maxSize) {
+    public VmCache<String, PartitionInfo> partitionServiceCache(@Value("${cache.expiration}") final int expiration,
+                                                                @Value("${cache.maxSize}") final int maxSize) {
         return new VmCache<>(expiration * 60, maxSize);
     }
 }