diff --git a/pom.xml b/pom.xml index efae5f1226e9961a973ffcc131525099ec25512a..71344c3419cc2dc9b4bc5f6f7561340a5ba6e9ce 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <os-core-common.version>0.9.0-rc3</os-core-common.version> + <os-core-common.version>v0.9.0-rc6</os-core-common.version> <tomcat_embed_core_version>9.0.37</tomcat_embed_core_version> </properties> diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index d643d1c72b561d16451d5ebca6157046cd04fa44..f73c8eade86ca7d751fcc70e1c55f5067d837bda 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -17,7 +17,7 @@ <properties> <osdu.partition-core.version>0.9.0-SNAPSHOT</osdu.partition-core.version> <osdu.corelibazure.version>0.8.0-rc1</osdu.corelibazure.version> - <osdu.oscorecommon.version>0.9.0-rc3</osdu.oscorecommon.version> + <osdu.oscorecommon.version>v0.9.0-rc6</osdu.oscorecommon.version> <azure.version>2.3.5</azure.version> <junit.version>4.12</junit.version> <mockito.version>2.25.0</mockito.version> diff --git a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java index 5aa7bc6ea5318b45f563c637f79b15285b321014..6ab366ca5820ead798fba408f0d53edc4b01147a 100644 --- a/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java +++ b/provider/partition-azure/src/main/java/org/opengroup/osdu/partition/provider/azure/di/RedisConfig.java @@ -1,6 +1,8 @@ package org.opengroup.osdu.partition.provider.azure.di; import com.azure.security.keyvault.secrets.SecretClient; +import com.lambdaworks.redis.ClientOptions; +import com.lambdaworks.redis.SocketOptions; import org.opengroup.osdu.azure.KeyVaultFacade; import org.opengroup.osdu.core.common.cache.RedisCache; import org.opengroup.osdu.partition.model.PartitionInfo; @@ -11,6 +13,7 @@ import org.springframework.context.annotation.Configuration; import javax.inject.Named; import java.util.List; +import java.util.concurrent.TimeUnit; @Configuration public class RedisConfig { @@ -42,12 +45,18 @@ public class RedisConfig { @Bean public RedisCache<String, PartitionInfo> partitionServiceCache(@Named("REDIS_HOST") String host, @Named("REDIS_PASSWORD") String password) { - return new RedisCache<>(host, port, password, expiration, database, String.class, PartitionInfo.class); + ClientOptions clientOptions = ClientOptions.builder() + .socketOptions(SocketOptions.builder().connectTimeout(15, TimeUnit.SECONDS).build()) + .build(); + return new RedisCache<>(host, port, password, expiration, database, clientOptions, 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); + ClientOptions clientOptions = ClientOptions.builder() + .socketOptions(SocketOptions.builder().connectTimeout(15, TimeUnit.SECONDS).build()) + .build(); + return new RedisCache(host, port, password, expiration, database, clientOptions, String.class, List.class); } } @@ -67,12 +76,18 @@ public class RedisConfig { @Bean public RedisCache<String, PartitionInfo> partitionServiceCache(@Named("REDIS_HOST") String host) { - return new RedisCache<>(host, port, expiration, database, String.class, PartitionInfo.class); + ClientOptions clientOptions = ClientOptions.builder() + .socketOptions(SocketOptions.builder().connectTimeout(15, TimeUnit.SECONDS).build()) + .build(); + return new RedisCache<>(host, port, expiration, database, clientOptions, 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); + ClientOptions clientOptions = ClientOptions.builder() + .socketOptions(SocketOptions.builder().connectTimeout(15, TimeUnit.SECONDS).build()) + .build(); + return new RedisCache(host, port, expiration, database, clientOptions, String.class, List.class); } }