lettucemod 3.7.2

redis-field-engineering · Sep 11, 2023 · c3030e6 · c3030e6
1 parent 3b5cc69
commit c3030e6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/core/redis-smart-cache-core/src/main/java/com/redis/smartcache/core/ClientManager.java b/core/redis-smart-cache-core/src/main/java/com/redis/smartcache/core/ClientManager.java
@@ -1,17 +1,17 @@
 package com.redis.smartcache.core;
 
+import com.redis.lettucemod.RedisModulesClient;
+import com.redis.lettucemod.cluster.RedisModulesClusterClient;
+import com.redis.smartcache.core.config.RedisConfig;
+import io.lettuce.core.AbstractRedisClient;
+import io.lettuce.core.RedisURI;
+import org.springframework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.redis.lettucemod.util.ClientBuilder;
-import com.redis.lettucemod.util.RedisURIBuilder;
-import com.redis.smartcache.core.config.RedisConfig;
-
-import io.lettuce.core.AbstractRedisClient;
-import io.lettuce.core.RedisURI;
-
 public class ClientManager implements AutoCloseable {
 
     private static final Logger log = Logger.getLogger(ClientManager.class.getName());
@@ -23,18 +23,33 @@ public AbstractRedisClient getClient(RedisConfig config) {
     }
 
     private AbstractRedisClient createClient(RedisConfig config) {
-        RedisURI redisURI = redisURI(config);
+        RedisURI redisURI = buildRedisURI(config);
         log.log(Level.FINE, "Creating Redis client with URI {0}", redisURI);
-        return ClientBuilder.create(redisURI).cluster(config.isCluster()).build();
+        if(config.isCluster()){
+            return RedisModulesClusterClient.create(redisURI);
+        }
+        else{
+            return RedisModulesClient.create(redisURI);
+        }
     }
 
-    private RedisURI redisURI(RedisConfig config) {
-        RedisURIBuilder builder = RedisURIBuilder.create();
-        builder.uri(config.getUri());
-        builder.username(config.getUsername());
-        builder.password(config.getPassword());
-        builder.ssl(config.isTls());
-        builder.sslVerifyMode(config.getTlsVerify());
+    private RedisURI buildRedisURI(RedisConfig config){
+        RedisURI startingUri = RedisURI.create(config.getUri());
+
+        RedisURI.Builder builder = RedisURI.builder(startingUri);
+
+        if(StringUtils.hasLength(config.getUsername()) && config.getPassword() != null && config.getPassword().length > 0){
+            builder.withAuthentication(config.getUsername(), config.getPassword());
+        }
+        else if(config.getPassword() != null && config.getPassword().length > 0){
+            builder.withPassword(config.getPassword());
+        }
+
+        if(config.isTls()){
+            builder.withSsl(config.isTls());
+            builder.withVerifyPeer(config.getTlsVerify());
+        }
+
         return builder.build();
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ checkerVersion             = 3.12.0
 db2Version                 = 11.5.8.0
 datafakerVersion           = 1.9.0
 jacocoVersion              = 0.8.10
-lettucemodVersion          = 3.6.3
+lettucemodVersion          = 3.7.2
 lettuceVersion             = 6.2.5.RELEASE
 micrometerRedisVersion     = 0.5.1
 mssqlVersion               = 12.2.0.jre8