From c8bfc7167826643915fc2a0d312bc97680d225a7 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Fri, 30 Nov 2018 10:30:36 +0100 Subject: [PATCH] DATAREDIS-721 - Polishing. Original Pull Request: #315 --- .../lettuce/ClusterConnectionProvider.java | 14 +++++++++----- .../lettuce/LettuceConnectionFactory.java | 1 + .../connection/lettuce/LettuceFutureUtils.java | 8 ++++---- .../lettuce/LettucePoolingConnectionProvider.java | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java index ae2a0555c..7a44aa291 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/ClusterConnectionProvider.java @@ -94,16 +94,20 @@ class ClusterConnectionProvider implements LettuceConnectionProvider, RedisClien } if (connectionType.equals(StatefulRedisPubSubConnection.class)) { - return client.connectPubSubAsync(codec).thenApply(connectionType::cast); + + return client.connectPubSubAsync(codec) // + .thenApply(connectionType::cast); } if (StatefulRedisClusterConnection.class.isAssignableFrom(connectionType) || connectionType.equals(StatefulConnection.class)) { - return client.connectAsync(codec).thenApply(conn -> { - readFrom.ifPresent(conn::setReadFrom); - return connectionType.cast(conn); - }); + return client.connectAsync(codec) // + .thenApply(connection -> { + + readFrom.ifPresent(connection::setReadFrom); + return connectionType.cast(connection); + }); } return LettuceFutureUtils diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index 3c12bdf5a..5c79307b9 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -276,6 +276,7 @@ public class LettuceConnectionFactory this.reactiveConnectionProvider = createConnectionProvider(client, LettuceReactiveRedisConnection.CODEC); if (isClusterAware()) { + this.clusterCommandExecutor = new ClusterCommandExecutor( new LettuceClusterTopologyProvider((RedisClusterClient) client), new LettuceClusterConnection.LettuceClusterNodeResourceProvider(this.connectionProvider), diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java index c9f96dc98..3f6365818 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java @@ -36,15 +36,15 @@ class LettuceFutureUtils { * exceptionally} given {@link Throwable}. This utility method allows exceptionally future creation with a single * invocation. * - * @param t must not be {@literal null}. + * @param throwable must not be {@literal null}. * @return the completed {@link CompletableFuture future}. */ - static CompletableFuture failed(Throwable t) { + static CompletableFuture failed(Throwable throwable) { - Assert.notNull(t, "Throwable must not be null!"); + Assert.notNull(throwable, "Throwable must not be null!"); CompletableFuture future = new CompletableFuture<>(); - future.completeExceptionally(t); + future.completeExceptionally(throwable); return future; } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java index 99108c3f2..0f8dfff55 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java @@ -126,12 +126,12 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red CompletableFuture> acquire = pool.acquire(); inProgressAsyncPoolRef.put(acquire, pool); - return acquire.whenComplete((conn, e) -> { + return acquire.whenComplete((connection, e) -> { inProgressAsyncPoolRef.remove(acquire); - if (conn != null) { - asyncPoolRef.put(conn, pool); + if (connection != null) { + asyncPoolRef.put(connection, pool); } }).thenApply(connectionType::cast); }