DATAREDIS-951 - Upgrade to Lettuce 5.1.6.

Replace custom builder adapter with ClusterClientOptions.builder(ClientOptions).

Author: mp911de

pom.xml

@@ -21,7 +21,7 @@
 <beanutils>1.9.2</beanutils>
 <xstream>1.4.8</xstream>
 <pool>2.6.0</pool>
-<lettuce>5.1.5.RELEASE</lettuce>
+<lettuce>5.1.6.RELEASE</lettuce>
 <jedis>3.0.1</jedis>
 <multithreadedtc>1.01</multithreadedtc>
 <netty>4.1.22.Final</netty>

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

@@ -1013,7 +1013,7 @@ private ClusterClientOptions getClusterClientOptions(ClusterConfiguration config
 .map(ClusterClientOptions.class::cast) //
 .orElseGet(() -> {
 return clientOptions //
-.map(LettuceConnectionFactory::toClusterClientOptions) //
+.map(it -> ClusterClientOptions.builder(it).build()) //
 .orElseGet(ClusterClientOptions::create);
 });
 
@@ -1024,22 +1024,6 @@ private ClusterClientOptions getClusterClientOptions(ClusterConfiguration config
 return clusterClientOptions;
 }
 
-// TODO: Replace with Lettuce 5.1.6 ClusterClientOptions.builder(ClientOptions)
-private static ClusterClientOptions toClusterClientOptions(ClientOptions it) {
-
-return ClusterClientOptions.builder() //
-.autoReconnect(it.isAutoReconnect()) //
-.cancelCommandsOnReconnectFailure(it.isCancelCommandsOnReconnectFailure()) //
-.disconnectedBehavior(it.getDisconnectedBehavior()) //
-.pingBeforeActivateConnection(it.isPingBeforeActivateConnection()) //
-.requestQueueSize(it.getRequestQueueSize()) //
-.socketOptions(it.getSocketOptions()) //
-.sslOptions(it.getSslOptions()) //
-.suspendReconnectOnProtocolFailure(it.isSuspendReconnectOnProtocolFailure())//
-.timeoutOptions(it.getTimeoutOptions()) //
-.build();
-}
-
 private RedisURI getSentinelRedisURI() {
 
 RedisURI redisUri = LettuceConverters.sentinelConfigurationToRedisURI(