DATAREDIS-665 - Upgrade to Lettuce 5.0 RC1.

Adapt to changes in Lettuce API.

Author: mp911de

pom.xml

@@ -21,7 +21,7 @@
 		<beanutils>1.9.2</beanutils>
 		<xstream>1.4.8</xstream>
 		<pool>2.2</pool>
-		<lettuce>5.0.0.M2</lettuce>
+		<lettuce>5.0.0.RC1</lettuce>
 		<jedis>2.9.0</jedis>
 		<multithreadedtc>1.01</multithreadedtc>
 	</properties>

src/main/java/org/springframework/data/redis/connection/convert/Converters.java

@@ -408,6 +408,16 @@ public static Converter<List<String>, Properties> listToPropertiesConverter() {
 		return STRING_LIST_TO_PROPERTIES_CONVERTER;
 	}
 
+	/**
+	 * Returns a converter to convert from {@link Map} to {@link Properties}.
+	 *
+	 * @return the converter.
+	 * @since 2.0
+	 */
+	public static Converter<Map<?, ?>, Properties> mapToPropertiesConverter() {
+		return MAP_TO_PROPERTIES;
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 * @since 1.8

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterServerCommands.java

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
@@ -228,20 +229,18 @@ public void shutdown(RedisClusterNode node) {
 	@Override
 	public Properties getConfig(final String pattern) {
 
-		List<NodeResult<List<String>>> mapResult = executeCommandOnAllNodes(client -> client.configGet(pattern))
+		List<NodeResult<Map<String, String>>> mapResult = executeCommandOnAllNodes(client -> client.configGet(pattern))
 				.getResults();
 
-		List<String> result = new ArrayList<>();
-		for (NodeResult<List<String>> entry : mapResult) {
+		Properties properties = new Properties();
+
+		for (NodeResult<Map<String, String>> entry : mapResult) {
 
 			String prefix = entry.getNode().asString();
-			int i = 0;
-			for (String value : entry.getValue()) {
-				result.add((i++ % 2 == 0 ? (prefix + ".") : "") + value);
-			}
+			entry.getValue().forEach((key, value) -> properties.setProperty(prefix + "." + key, value));
 		}
 
-		return Converters.toProperties(result);
+		return properties;
 	}
 
 	/*

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java

@@ -767,8 +767,7 @@ private AbstractRedisClient createRedisClient() {
 					.map(clientResources -> RedisClusterClient.create(clientResources, initialUris)) //
 					.orElseGet(() -> RedisClusterClient.create(initialUris));
 
-			this.clusterCommandExecutor = new ClusterCommandExecutor(
-					new LettuceClusterTopologyProvider(clusterClient),
+			this.clusterCommandExecutor = new ClusterCommandExecutor(new LettuceClusterTopologyProvider(clusterClient),
 					new LettuceClusterConnection.LettuceClusterNodeResourceProvider(clusterClient), EXCEPTION_TRANSLATION);
 
 			clientConfiguration.getClientOptions() //
@@ -795,6 +794,7 @@ private RedisURI getSentinelRedisURI() {
 		RedisURI redisUri = LettuceConverters.sentinelConfigurationToRedisURI(sentinelConfiguration);
 
 		getRedisPassword().toOptional().ifPresent(redisUri::setPassword);
+		redisUri.setTimeout(clientConfiguration.getCommandTimeout());
 
 		return redisUri;
 	}
@@ -808,7 +808,7 @@ private RedisURI createRedisURIAndApplySettings(String host, int port) {
 		builder.withSsl(clientConfiguration.isUseSsl());
 		builder.withVerifyPeer(clientConfiguration.isVerifyPeer());
 		builder.withStartTls(clientConfiguration.isStartTls());
-		builder.withTimeout(clientConfiguration.getCommandTimeout().toMillis(), TimeUnit.MILLISECONDS);
+		builder.withTimeout(clientConfiguration.getCommandTimeout());
 
 		return builder.build();
 	}

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveClusterServerCommands.java

@@ -205,7 +205,7 @@ public Mono<Properties> getConfig(RedisClusterNode node, String pattern) {
 
 		Assert.hasText(pattern, "Pattern must not be null nor empty!");
 
-		return connection.execute(node, c -> c.configGet(pattern).collectList()) //
+		return connection.execute(node, c -> c.configGet(pattern)) //
 				.map(LettuceConverters::toProperties) //
 				.next();
 	}

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveServerCommands.java

@@ -149,7 +149,7 @@ public Mono<Properties> getConfig(String pattern) {
 
 		Assert.hasText(pattern, "Pattern must not be null nor empty!");
 
-		return connection.execute(c -> c.configGet(pattern).collectList()) //
+		return connection.execute(c -> c.configGet(pattern)) //
 				.map(LettuceConverters::toProperties).next();
 	}
 

src/main/java/org/springframework/data/redis/connection/lettuce/LettuceServerCommands.java

@@ -281,12 +281,12 @@ public Properties getConfig(String param) {
 		try {
 			if (isPipelined()) {
 				pipeline(
-						connection.newLettuceResult(getAsyncConnection().configGet(param), Converters.listToPropertiesConverter()));
+						connection.newLettuceResult(getAsyncConnection().configGet(param), Converters.mapToPropertiesConverter()));
 				return null;
 			}
 			if (isQueueing()) {
 				transaction(
-						connection.newLettuceTxResult(getConnection().configGet(param), Converters.listToPropertiesConverter()));
+						connection.newLettuceTxResult(getConnection().configGet(param), Converters.mapToPropertiesConverter()));
 				return null;
 			}
 			return Converters.toProperties(getConnection().configGet(param));

src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryUnitTests.java

@@ -34,7 +34,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
 import org.junit.Before;
@@ -93,8 +92,7 @@ public void timeoutShouldBeSetCorrectlyOnClusterClient() {
 		Iterable<RedisURI> initialUris = (Iterable<RedisURI>) getField(client, "initialUris");
 
 		for (RedisURI uri : initialUris) {
-			assertThat(uri.getTimeout(), is(equalTo(connectionFactory.getTimeout())));
-			assertThat(uri.getUnit(), is(equalTo(TimeUnit.MILLISECONDS)));
+			assertThat(uri.getTimeout(), is(equalTo(Duration.ofMillis(connectionFactory.getTimeout()))));
 		}
 	}