upgraded to lettusearch 2.4.4

Author: jruaux

build.gradle

@@ -1,10 +1,12 @@
 plugins {
 	id 'java'
+	id 'distribution'
     id 'java-library'
+    id 'java-library-distribution'
     id 'maven-publish'
-    id 'com.github.ben-manes.versions' version '0.33.0'
     id 'com.jfrog.bintray' version '1.8.5'
     id 'net.researchgate.release' version '2.8.1'
+    id 'com.github.ben-manes.versions' version '0.33.0'
     id 'com.github.breadmoirai.github-release' version '2.2.12'    
 }
 
@@ -19,8 +21,10 @@ repositories {
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter:2.3.4.RELEASE'
-	api 'com.redislabs:lettusearch:2.4.3'
+	implementation ('org.springframework.boot:spring-boot-starter:2.3.4.RELEASE') {
+		exclude group: 'io.lettuce', module: 'lettuce-core'
+	}
+	api 'com.redislabs:lettusearch:2.4.4'
 	api 'org.apache.commons:commons-pool2:2.9.0'
 	compileOnly 'org.projectlombok:lombok:1.18.16'
 	annotationProcessor 'org.projectlombok:lombok:1.18.16'

src/main/java/com/redislabs/springredisearch/RediSearchAutoConfiguration.java

@@ -20,56 +20,58 @@
 @EnableConfigurationProperties(RedisProperties.class)
 public class RediSearchAutoConfiguration {
 
-    @Bean
-    RedisURI redisURI(RedisProperties properties) {
-        RedisURI redisURI = RedisURI.create(properties.getHost(), properties.getPort());
-        if (properties.getPassword() != null) {
-            redisURI.setPassword(properties.getPassword());
-        }
-        Duration timeout = properties.getTimeout();
-        if (timeout != null) {
-            redisURI.setTimeout(timeout);
-        }
-        return redisURI;
-    }
+	@Bean
+	RedisURI redisURI(RedisProperties properties) {
+		RedisURI redisURI = RedisURI.create(properties.getHost(), properties.getPort());
+		if (properties.getPassword() != null) {
+			redisURI.setPassword(properties.getPassword().toCharArray());
+		}
+		Duration timeout = properties.getTimeout();
+		if (timeout != null) {
+			redisURI.setTimeout(timeout);
+		}
+		return redisURI;
+	}
 
-    @Bean(destroyMethod = "shutdown")
-    ClientResources clientResources() {
-        return DefaultClientResources.create();
-    }
+	@Bean(destroyMethod = "shutdown")
+	ClientResources clientResources() {
+		return DefaultClientResources.create();
+	}
 
-    @Bean(destroyMethod = "shutdown")
-    RediSearchClient client(RedisURI redisURI, ClientResources clientResources) {
-        return RediSearchClient.create(clientResources, redisURI);
-    }
+	@Bean(destroyMethod = "shutdown")
+	RediSearchClient client(RedisURI redisURI, ClientResources clientResources) {
+		return RediSearchClient.create(clientResources, redisURI);
+	}
 
-    @Bean(name = "rediSearchConnection", destroyMethod = "close")
-    StatefulRediSearchConnection<String, String> connection(RediSearchClient rediSearchClient) {
-        return rediSearchClient.connect();
-    }
+	@Bean(name = "rediSearchConnection", destroyMethod = "close")
+	StatefulRediSearchConnection<String, String> connection(RediSearchClient rediSearchClient) {
+		return rediSearchClient.connect();
+	}
 
-    @Bean(name = "rediSearchConnectionPoolConfig")
-    GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>> poolConfig(RedisProperties redisProperties) {
-        return configure(redisProperties, new GenericObjectPoolConfig<>());
-    }
+	@Bean(name = "rediSearchConnectionPoolConfig")
+	GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>> poolConfig(RedisProperties redisProperties) {
+		return configure(redisProperties, new GenericObjectPoolConfig<>());
+	}
 
-    public <K, V> GenericObjectPoolConfig<StatefulRediSearchConnection<K, V>> configure(RedisProperties redisProperties, GenericObjectPoolConfig<StatefulRediSearchConnection<K, V>> config) {
-        config.setJmxEnabled(false);
-        Pool poolProps = redisProperties.getLettuce().getPool();
-        if (poolProps != null) {
-            config.setMaxTotal(poolProps.getMaxActive());
-            config.setMaxIdle(poolProps.getMaxIdle());
-            config.setMinIdle(poolProps.getMinIdle());
-            if (poolProps.getMaxWait() != null) {
-                config.setMaxWaitMillis(poolProps.getMaxWait().toMillis());
-            }
-        }
-        return config;
-    }
+	public <K, V> GenericObjectPoolConfig<StatefulRediSearchConnection<K, V>> configure(RedisProperties redisProperties,
+			GenericObjectPoolConfig<StatefulRediSearchConnection<K, V>> config) {
+		config.setJmxEnabled(false);
+		Pool poolProps = redisProperties.getLettuce().getPool();
+		if (poolProps != null) {
+			config.setMaxTotal(poolProps.getMaxActive());
+			config.setMaxIdle(poolProps.getMaxIdle());
+			config.setMinIdle(poolProps.getMinIdle());
+			if (poolProps.getMaxWait() != null) {
+				config.setMaxWaitMillis(poolProps.getMaxWait().toMillis());
+			}
+		}
+		return config;
+	}
 
-    @Bean(name = "rediSearchConnectionPool", destroyMethod = "close")
-    GenericObjectPool<StatefulRediSearchConnection<String, String>> pool(GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>> config, RediSearchClient client) {
-        return ConnectionPoolSupport.createGenericObjectPool(client::connect, config);
-    }
+	@Bean(name = "rediSearchConnectionPool", destroyMethod = "close")
+	GenericObjectPool<StatefulRediSearchConnection<String, String>> pool(
+			GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>> config, RediSearchClient client) {
+		return ConnectionPoolSupport.createGenericObjectPool(client::connect, config);
+	}
 
 }