upgraded to lettusearch 1.12.8

Author: jruaux

build.gradle

@@ -1,4 +1,7 @@
 plugins {
+	id 'org.springframework.boot' version '2.2.4.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
+	id 'java'
     id 'java-library'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.8.4'
@@ -12,12 +15,20 @@ repositories {
 	mavenLocal()
 }
 
+bootJar {
+  enabled = false
+}
+
+jar {
+  enabled = true
+}
+
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-autoconfigure:2.2.4.RELEASE'
-	api 'com.redislabs:lettusearch:1.12.6'
-	api 'org.apache.commons:commons-pool2:2.8.0'
-	compileOnly 'org.projectlombok:lombok:1.18.10'
-	annotationProcessor 'org.projectlombok:lombok:1.18.10'
+	implementation 'org.springframework.boot:spring-boot-starter'
+	api 'com.redislabs:lettusearch:1.12.8'
+	api 'org.apache.commons:commons-pool2'
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
 }
 
 test {

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

@@ -4,10 +4,8 @@
 
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties.Pool;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,39 +17,23 @@
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
 import io.lettuce.core.support.ConnectionPoolSupport;
-import lombok.AccessLevel;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 @Configuration(proxyBeanMethods = false)
-@ConfigurationProperties(prefix = "spring.redisearch")
 @EnableConfigurationProperties(RedisProperties.class)
-public @Data class RediSearchAutoConfiguration {
-
-	@Autowired
-	@Getter(AccessLevel.NONE)
-	@Setter(AccessLevel.NONE)
-	private RedisProperties props;
-	private String host;
-	private Integer port;
-	private String password;
-	private Duration timeout;
-	private Pool pool;
+public class RediSearchAutoConfiguration {
 
 	@Bean(destroyMethod = "shutdown")
 	ClientResources clientResources() {
 		return DefaultClientResources.create();
 	}
 
 	@Bean(destroyMethod = "shutdown")
-	RediSearchClient client(ClientResources clientResources) {
-		RedisURI redisURI = RedisURI.create(host(), port());
-		String password = password();
-		if (password != null) {
-			redisURI.setPassword(password);
+	RediSearchClient client(RedisProperties props, ClientResources clientResources) {
+		RedisURI redisURI = RedisURI.create(props.getHost(), props.getPort());
+		if (props.getPassword() != null) {
+			redisURI.setPassword(props.getPassword());
 		}
-		Duration timeout = timeout();
+		Duration timeout = props.getTimeout();
 		if (timeout != null) {
 			redisURI.setTimeout(timeout);
 		}
@@ -64,13 +46,13 @@ StatefulRediSearchConnection<String, String> connection(RediSearchClient rediSea
 	}
 
 	@Bean(name = "rediSearchConnectionPool", destroyMethod = "close")
-	GenericObjectPool<StatefulRediSearchConnection<String, String>> rediSearchConnectionPool(
+	GenericObjectPool<StatefulRediSearchConnection<String, String>> pool(RedisProperties props,
 			RediSearchClient rediSearchClient) {
 		GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>> config = new GenericObjectPoolConfig<StatefulRediSearchConnection<String, String>>();
 		config.setJmxEnabled(false);
 		GenericObjectPool<StatefulRediSearchConnection<String, String>> pool = ConnectionPoolSupport
 				.createGenericObjectPool(() -> rediSearchClient.connect(), config);
-		Pool poolProps = pool();
+		Pool poolProps = props.getLettuce().getPool();
 		if (poolProps != null) {
 			pool.setMaxTotal(poolProps.getMaxActive());
 			pool.setMaxIdle(poolProps.getMaxIdle());
@@ -82,38 +64,4 @@ GenericObjectPool<StatefulRediSearchConnection<String, String>> rediSearchConnec
 		return pool;
 	}
 
-	private Pool pool() {
-		if (pool == null) {
-			return props.getLettuce().getPool();
-		}
-		return pool;
-	}
-
-	private String host() {
-		if (host == null) {
-			return props.getHost();
-		}
-		return host;
-	}
-
-	private int port() {
-		if (port == null) {
-			return props.getPort();
-		}
-		return port;
-	}
-
-	private String password() {
-		if (password == null) {
-			return props.getPassword();
-		}
-		return password;
-	}
-
-	private Duration timeout() {
-		if (timeout == null) {
-			return props.getTimeout();
-		}
-		return timeout;
-	}
 }