DATAREDIS-951 - Upgrade to Lettuce 5.1.6.

Replace custom builder adapter with ClusterClientOptions.builder(ClientOptions).
This commit is contained in:
Mark Paluch
2019-03-27 08:45:24 +01:00
parent 34bcd46620
commit 321199c084
2 changed files with 2 additions and 18 deletions

View File

@@ -1013,7 +1013,7 @@ public class LettuceConnectionFactory
.map(ClusterClientOptions.class::cast) //
.orElseGet(() -> {
return clientOptions //
.map(LettuceConnectionFactory::toClusterClientOptions) //
.map(it -> ClusterClientOptions.builder(it).build()) //
.orElseGet(ClusterClientOptions::create);
});
@@ -1024,22 +1024,6 @@ public class LettuceConnectionFactory
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(