Skip to content
Snippets Groups Projects
Commit a8413c4c authored by Kelly Zhou's avatar Kelly Zhou
Browse files

add clientOprtions to redis cache construction

parent 35c4b007
No related branches found
No related tags found
1 merge request!50update logging library to latest, update core common library to add client option to rediscache construction
Pipeline #37868 failed
......@@ -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>
......
......@@ -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>
......
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);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment